diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2009-06-04 23:48:01 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2009-06-04 23:48:01 +0000 |
| commit | 017cfaedee718bcec7074ef4d98571848f4395f1 (patch) | |
| tree | 4442bff4de3ca5c41e3bfe1a1086e6b1d555cc19 | |
| parent | c4a624ccbe5d881a11d8fe1fa561a33193d2da10 (diff) | |
Change i386 ACPI sleep to KASSERT if the pmap can't be activated
properly. Now i386 and amd64 implementations match.
ok art
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index 47460d9169a..7488077f74c 100644 --- a/sys/arch/i386/i386/acpi_machdep.c +++ b/sys/arch/i386/i386/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.19 2009/06/03 19:05:34 art Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.20 2009/06/04 23:48:00 mlarkin Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -217,11 +217,8 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) if (rcr3() != pmap_kernel()->pm_pdirpa) { pmap_activate(curproc); - if (rcr3() != pmap_kernel()->pm_pdirpa) { - printf("%s: acpi_sleep_machdep: only kernel thread\n", - DEVNAME(sc)); - return (ENXIO); - } + + KASSERT(rcr3() == pmap_kernel()->pm_pdirpa); } /* |