diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2009-11-26 22:08:30 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2009-11-26 22:08:30 +0000 |
| commit | e1c5928ba64723c7b402bf4df5b76c641bcdabeb (patch) | |
| tree | f2898c2b2e431a53ef561a4657415fa2f7104166 | |
| parent | Remove a couple of unused arguments where possible, and add /* ARGSUSED */ to (diff) | |
| download | wireguard-openbsd-e1c5928ba64723c7b402bf4df5b76c641bcdabeb.tar.xz wireguard-openbsd-e1c5928ba64723c7b402bf4df5b76c641bcdabeb.zip | |
Reset the wakeup vector to ensure that we don't resume on reboot.
Temporarily disabled for debugging purposes, but can be turned on if
needed.
ok deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_machdep.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index e1f9fe70f89..46038691d50 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.30 2009/11/26 11:49:49 deraadt Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.31 2009/11/26 22:08:30 mlarkin Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -231,6 +231,11 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) if (acpi_enter_sleep_state(sc, state) != 0) panic("%s: acpi_enter_sleep_state failed", DEVNAME(sc)); } +#if 0 + /* Temporarily disabled for debugging purposes */ + /* Reset the wakeup vector to avoid resuming on reboot */ + sc->sc_facs->wakeup_vector = 0; +#endif #if NISA > 0 i8259_default_setup(); diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c index 464fc9413b0..a5cc64cfc77 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.25 2009/11/24 17:39:59 mlarkin Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.26 2009/11/26 22:08:30 mlarkin Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -258,6 +258,12 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) * last call instruction - after the call to acpi_savecpu. */ +#if 0 + /* Temporarily disabled for debugging purposes */ + /* Reset the wakeup vector to avoid resuming on reboot */ + sc->sc_facs->wakeup_vector = 0; +#endif + #if NISA > 0 isa_defaultirq(); #endif |