summaryrefslogtreecommitdiff
path: root/sys/arch/luna88k
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-07-10 21:46:04 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-07-10 21:46:04 +0000
commit772a80c79188981e74651961c96c65117a0b46c3 (patch)
tree03fa5372b6a066940fc862cfc67d03e088209d9e /sys/arch/luna88k
parentbaed53032561b8641613288804ac4719273fd74d (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/luna88k')
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 3cb1d31ecbb..1b0b68eeb48 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.104 2014/07/10 20:37:42 uebayasi Exp $ */
+/* $OpenBSD: machdep.c,v 1.105 2014/07/10 21:46:03 mpi Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -492,6 +492,7 @@ boot(int howto)
uvm_shutdown();
splhigh(); /* Disable interrupts. */
+ cold = 1;
/* If rebooting and a dump is requested, do it. */
if (howto & RB_DUMP)