diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-08-07 22:06:49 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2013-08-07 22:06:49 +0000 |
| commit | a80b3962fbc1092c6d4ab5b016b75770ec3d7a41 (patch) | |
| tree | 8ec6f72f77410d3303dfb42146621b7a15c6c613 | |
| parent | 95a9de286dc60f70acf9760fabd4ffbddb06258b (diff) | |
After a panic, do not fill up the dmesg with splassert messages.
They scroll away the important information. Disable splassert in
panic().
OK deraadt@ uebayasi@ sthen@
| -rw-r--r-- | sys/kern/subr_prf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 51f241bf39b..6ad71f5fab4 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.78 2013/07/03 15:17:24 sf Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.79 2013/08/07 22:06:48 bluhm Exp $ */ /* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */ /*- @@ -185,6 +185,9 @@ panic(const char *fmt, ...) int bootopt; va_list ap; + /* do not trigger assertions, we know that we are inconsistent */ + splassert_ctl = 0; + bootopt = RB_AUTOBOOT | RB_DUMP; va_start(ap, fmt); if (panicstr) |