diff options
| author | Stefan Fritsch <sf@cvs.openbsd.org> | 2015-07-16 23:03:41 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@cvs.openbsd.org> | 2015-07-16 23:03:41 +0000 |
| commit | 7e7ea7e7fd1746fde299b6e5c7e5be2f9301c5bb (patch) | |
| tree | 1dc0db1f3d343c70ddef85d2ed7d467cb598303a | |
| parent | 05997bb8052666b5d67f25a21794e929f0064796 (diff) | |
Remove 4 second delay on reboot/shutdown that was added 8 years
ago to "workaround MP timeout/splhigh/scsi race at reboot time".
Probably the issue has been fixed by now. And if not, the relevant scsi
controller drivers should add a workaround in their DVACT_POWERDOWN
hook.
While there, change the default final reset delay on amd64 to 0. People
who like looking at the final reboot message may still set the
CPURESET_DELAY define.
OK deraadt@ kettenis@ mlarkin@ uebayasi@
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 1740630bdcd..ae26de1d59f 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.214 2015/06/28 18:54:54 guenther Exp $ */ +/* $OpenBSD: machdep.c,v 1.215 2015/07/16 23:03:40 sf Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -162,7 +162,7 @@ int setperf_prio = 0; #ifdef CPURESET_DELAY int cpureset_delay = CPURESET_DELAY; #else -int cpureset_delay = 2000; /* default to 2s */ +int cpureset_delay = 0; #endif int physmem; @@ -740,8 +740,6 @@ boot(int howto) } if_downall(); - delay(4*1000000); /* XXX */ - uvm_shutdown(); splhigh(); cold = 1; diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 265fe92a8ed..959832f4dc0 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.572 2015/07/16 05:10:14 guenther Exp $ */ +/* $OpenBSD: machdep.c,v 1.573 2015/07/16 23:03:40 sf Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2619,8 +2619,6 @@ boot(int howto) } if_downall(); - delay(4*1000000); /* XXX */ - uvm_shutdown(); splhigh(); cold = 1; |