diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-08-20 04:42:25 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-08-20 04:42:25 +0000 |
| commit | cd92a6182d185aee7c2ee80a8ced36843c4a446a (patch) | |
| tree | 9cad9d79d1bf04889d64a7c8fff71e6a2194ce90 /sys/kern/kern_xxx.c | |
| parent | b131795bda8121e06900981fe626873d516c1e6e (diff) | |
| download | src-cd92a6182d185aee7c2ee80a8ced36843c4a446a.tar.gz src-cd92a6182d185aee7c2ee80a8ced36843c4a446a.zip | |
Call boot() instead of cpu_reset() if init isn't running in shutdown_nice.
Notes
Notes:
svn path=/head/; revision=10127
Diffstat (limited to 'sys/kern/kern_xxx.c')
| -rw-r--r-- | sys/kern/kern_xxx.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 816a50f2d14d..0ef0a36206af 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_xxx.c 8.2 (Berkeley) 11/14/93 - * $Id: kern_xxx.c,v 1.11 1995/07/30 17:10:36 davidg Exp $ + * $Id: kern_xxx.c,v 1.12 1995/08/06 19:45:34 joerg Exp $ */ #include <sys/param.h> @@ -43,7 +43,6 @@ #include <sys/sysctl.h> #include <sys/utsname.h> #include <sys/signalvar.h> -#include <machine/md_var.h> /* This implements a "TEXT_SET" for cleanup functions */ @@ -170,12 +169,12 @@ shutdown_nice(void) register struct proc *p; /* Send a signal to init(8) and have it shutdown the world */ - if (initproc != NULL) + if (initproc != NULL) { psignal(initproc, SIGINT); - else - /* No init(8) running, simply reset the CPU */ - cpu_reset(); - + } else { + /* No init(8) running, so simply reboot */ + boot(RB_NOSYNC); + } return; } |