diff options
| author | jhb <jhb@FreeBSD.org> | 2001-08-23 20:32:21 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-08-23 20:32:21 +0000 |
| commit | 1383792740ea5dc3ab1c1a913165d848ce096ec5 (patch) | |
| tree | eb02f1d61fe71a6ec8e8fa4fd35a2552a741e661 /sys/kern/kern_shutdown.c | |
| parent | 7e0c531a0d012f6d90bbc79927113ac769205d70 (diff) | |
| download | FreeBSD-src-1383792740ea5dc3ab1c1a913165d848ce096ec5.zip FreeBSD-src-1383792740ea5dc3ab1c1a913165d848ce096ec5.tar.gz | |
Add a new kernel option RESTARTABLE_PANICS. If this option is present,
then one can restart from a panic by resetting the panicstr variable to
NULL. This commit conditionalizes the previously committed functionality
on this variable. It also removes the __dead2 attribute from the panic()
function so that when one continues from a panic() the behavior will
be predictable.
Diffstat (limited to 'sys/kern/kern_shutdown.c')
| -rw-r--r-- | sys/kern/kern_shutdown.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 3b83723..1afa80f 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -610,6 +610,7 @@ panic(const char *fmt, ...) #if defined(DDB) if (debugger_on_panic) Debugger ("panic"); +#ifdef RESTARTABLE_PANICS /* See if the user aborted the panic, in which case we continue. */ if (panicstr == NULL) { #ifdef SMP @@ -618,6 +619,7 @@ panic(const char *fmt, ...) return; } #endif +#endif boot(bootopt); } |
