summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2009-06-01 19:59:19 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2009-06-01 19:59:19 +0000
commit9864d05fe54b2edebc3615245f7a33cfdf3580f0 (patch)
tree0945a03058f44461e1c2fc554876bc85a62e21c9
parentf8d7e4725bdfb323dc5095eb2d8e80a36d63a496 (diff)
Use proper pmap during ACPI sleep on amd64. Original code by Kurt,
this version by Art. additional ok by marco@
-rw-r--r--sys/arch/amd64/amd64/acpi_machdep.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c
index 075b9e2f249..d6a044c0dd3 100644
--- a/sys/arch/amd64/amd64/acpi_machdep.c
+++ b/sys/arch/amd64/amd64/acpi_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi_machdep.c,v 1.17 2009/05/31 03:42:38 mlarkin Exp $ */
+/* $OpenBSD: acpi_machdep.c,v 1.18 2009/06/01 19:59:18 mlarkin Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
*
@@ -202,9 +202,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
}
if (rcr3() != pmap_kernel()->pm_pdirpa) {
- printf("%s: acpi_sleep_machdep: only kernel may sleep\n",
- DEVNAME(sc));
- return (ENXIO);
+ pmap_activate(curproc);
}
/*