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/socppc | |
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/socppc')
-rw-r--r-- | sys/arch/socppc/socppc/machdep.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c index 461349e2a37..7f0a6644adb 100644 --- a/sys/arch/socppc/socppc/machdep.c +++ b/sys/arch/socppc/socppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.30 2011/06/05 19:41:08 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.31 2011/06/26 22:40:00 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -48,6 +48,7 @@ #include <sys/tty.h> #include <sys/user.h> +#include <net/if.h> #include <uvm/uvm.h> #include <machine/bat.h> @@ -1062,6 +1063,7 @@ boot(int howto) printf("WARNING: not updating battery clock\n"); } } + if_downall(); uvm_shutdown(); splhigh(); |