diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-26 22:40:01 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-26 22:40:01 +0000 |
| commit | faf5f1c428343fb3b63d0d5c8e1f3281e5fb096a (patch) | |
| tree | f68032641ab88713a1e6a1d4e8db85a94c44fa65 /sys/arch/i386 | |
| parent | e4406dbd9a603957bda0912007302178f3920008 (diff) | |
if_downall() cannot be done MI in sys_reboot() because vfs_shutdown()
might need network (ie. nfs). Move the call to the MD boot() routines.
This cause for boot hangs diagnosed by kettenis.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index a87f5d910d0..f2d049be0fd 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.502 2011/06/26 21:46:03 tedu Exp $ */ +/* $OpenBSD: machdep.c,v 1.503 2011/06/26 22:39:59 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -99,6 +99,7 @@ #include <dev/cons.h> #include <stand/boot/bootarg.h> +#include <net/if.h> #include <uvm/uvm_extern.h> #include <uvm/uvm_swap.h> @@ -2434,6 +2435,7 @@ boot(int howto) printf("WARNING: not updating battery clock\n"); } } + if_downall(); delay(4*1000000); /* XXX */ |