@@ -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);
}