summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-31 15:55:47 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-10-31 15:55:47 +0000
commita4fdae7bd0c8f0dd2b13d207a64a802b10fa0ed5 (patch)
tree2f0d5c5caa2877349b75cf002d8277195e39c32b /sys/arch/i386
parenta775835694b5d9d3af83e1281d0b3834c5e26d03 (diff)
for now, workaround MP timeout/splhigh/scsi race at reboot time using a
delay. will be revisited. ok art
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 39b623bf62a..0bb993a2149 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.408 2007/09/30 17:50:20 gwk Exp $ */
+/* $OpenBSD: machdep.c,v 1.409 2007/10/31 15:55:44 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2389,6 +2389,8 @@ boot(int howto)
}
}
+ delay(4*1000000); /* XXX */
+
/* Disable interrupts. */
splhigh();