Fri Sep 19 11:19:33 2008 UTC ()
Revert previous.


(jmcneill)
diff -r1.119 -r1.120 src/sys/dev/acpi/acpi.c

cvs diff -r1.119 -r1.120 src/sys/dev/acpi/acpi.c (expand / switch to context diff)
--- src/sys/dev/acpi/acpi.c 2008/09/10 03:56:12 1.119
+++ src/sys/dev/acpi/acpi.c 2008/09/19 11:19:33 1.120
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.119 2008/09/10 03:56:12 jmcneill Exp $	*/
+/*	$NetBSD: acpi.c,v 1.120 2008/09/19 11:19:33 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.119 2008/09/10 03:56:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.120 2008/09/19 11:19:33 jmcneill Exp $");
 
 #include "opt_acpi.h"
 #include "opt_pcifixup.h"
@@ -1271,13 +1271,11 @@
 				    AcpiFormatException(ret));
 			AcpiLeaveSleepState((UINT8)state);
 		} else {
-			int s = splhigh();
 			err = acpi_md_sleep(state);
 			if (state == ACPI_STATE_S4)
 				AcpiEnable();
 			pmf_system_bus_resume(PMF_F_NONE);
 			AcpiLeaveSleepState((UINT8)state);
-			splx(s);
 			pmf_system_resume(PMF_F_NONE);
 		}