diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-10 21:46:04 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-07-10 21:46:04 +0000 |
| commit | 772a80c79188981e74651961c96c65117a0b46c3 (patch) | |
| tree | 03fa5372b6a066940fc862cfc67d03e088209d9e /sys/arch/i386 | |
| parent | baed53032561b8641613288804ac4719273fd74d (diff) | |
Set cold to 1 before executing the DVACT_POWERDOWN handlers when halting or
rebooting a machine, like it is done in the hibernate case.
At least some USB host controller drivers rely on this to busy way instead
of sleeping. Avoid a panic on macppc with an uhci(4) cardbus plugged in.
ok deraadt@, uebayashi@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 97c166adb9c..032caa718f4 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.544 2014/07/10 20:15:27 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.545 2014/07/10 21:46:03 mpi Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2590,6 +2590,7 @@ boot(int howto) uvm_shutdown(); splhigh(); /* Disable interrupts. */ + cold = 1; /* Do a dump if requested. */ if (howto & RB_DUMP) |