summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2009-11-26 22:08:31 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2009-11-26 22:08:31 +0000
commit86d9d8cd065e204e52f8da4f48cd53709c95e7fc (patch)
treec1ef6490fab39c7c278ab2678ccf34eedfa7b97b /sys/arch/i386
parente74df4cfa4b067f5abc2b65af1d49c951cbf7f05 (diff)
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@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/acpi_machdep.c8
1 files changed, 7 insertions, 1 deletions
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