summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_shutdown.c
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2011-06-08 19:28:59 +0000
committerattilio <attilio@FreeBSD.org>2011-06-08 19:28:59 +0000
commit2514230a6b2cd5f522ad6c7f81f9ca6e8c5adcdd (patch)
treef6a6e72e49c377bd07916b312d89ad8d6aacfd3f /sys/kern/kern_shutdown.c
parent16bd3330590b275af35c593ea7c7e4c3eb27be0c (diff)
downloadFreeBSD-src-2514230a6b2cd5f522ad6c7f81f9ca6e8c5adcdd.zip
FreeBSD-src-2514230a6b2cd5f522ad6c7f81f9ca6e8c5adcdd.tar.gz
In the current code, a double panic condition may lead to dumps
interleaving. Signal dumping to happen only for the first panic which should be the most important. Sponsored by: Sandvine Incorporated Submitted by: Nima Misaghian (nmisaghian AT sandvine DOT com) MFC after: 2 weeks
Diffstat (limited to 'sys/kern/kern_shutdown.c')
-rw-r--r--sys/kern/kern_shutdown.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index da041fa..60e854f 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -555,11 +555,12 @@ panic(const char *fmt, ...)
; /* nothing */
#endif
- bootopt = RB_AUTOBOOT | RB_DUMP;
+ bootopt = RB_AUTOBOOT;
newpanic = 0;
if (panicstr)
bootopt |= RB_NOSYNC;
else {
+ bootopt |= RB_DUMP;
panicstr = fmt;
newpanic = 1;
}
OpenPOWER on IntegriCloud