summaryrefslogtreecommitdiff
path: root/sys/arch/vax
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-05-30 13:46:18 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-05-30 13:46:18 +0000
commitcfecb2e3803e8535b11d7f73d4537242c8d4d22c (patch)
treebc4a3bd6e04487ccbeb96304852e7cae161c10f9 /sys/arch/vax
parentd365054a04668d618738f402bfb204f1829a1764 (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/vax')
-rw-r--r--sys/arch/vax/vax/machdep.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 7bc014bdba7..98a8e3dbdf8 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.134 2014/05/25 13:57:48 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.135 2014/05/30 13:46:17 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -538,7 +538,8 @@ boot(howto)
if_downall();
uvm_shutdown();
- splhigh(); /* extreme priority */
+ splhigh(); /* Disable interrupts. */
+ cold = 1;
/* If rebooting and a dump is requested, do it. */
if (howto & RB_DUMP)