diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index 46038691d50..abeae9a1998 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.31 2009/11/26 22:08:30 mlarkin Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.32 2009/11/29 21:21:06 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -202,11 +202,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) return (ENXIO); } - if (rcr3() != pmap_kernel()->pm_pdirpa) { - pmap_activate(curproc); - - KASSERT(rcr3() == pmap_kernel()->pm_pdirpa); - } + /* amd64 does not do lazy pmap_activate */ /* * diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index a5cc64cfc77..42ca7069e00 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.26 2009/11/26 22:08:30 mlarkin Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.27 2009/11/29 21:21:06 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -219,11 +219,8 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) return (ENXIO); } - if (rcr3() != pmap_kernel()->pm_pdirpa) { - pmap_activate(curproc); - - KASSERT(rcr3() == pmap_kernel()->pm_pdirpa); - } + /* i386 does lazy pmap_activate */ + pmap_activate(curproc); /* * |