diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-31 15:55:47 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-31 15:55:47 +0000 |
| commit | a4fdae7bd0c8f0dd2b13d207a64a802b10fa0ed5 (patch) | |
| tree | 2f0d5c5caa2877349b75cf002d8277195e39c32b | |
| parent | a775835694b5d9d3af83e1281d0b3834c5e26d03 (diff) | |
for now, workaround MP timeout/splhigh/scsi race at reboot time using a
delay. will be revisited. ok art
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index dc2e00166ec..23b67fde92d 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.63 2007/10/28 10:25:09 martin Exp $ */ +/* $OpenBSD: machdep.c,v 1.64 2007/10/31 15:55:46 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -761,6 +761,8 @@ boot(int howto) } } + delay(4*1000000); /* XXX */ + /* Disable interrupts. */ splhigh(); 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(); |