diff options
| author |   bluhm <bluhm@openbsd.org> | 2013-08-07 22:06:48 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2013-08-07 22:06:48 +0000 |
| commit | 854b8769c65c9581b6480f98008c305517664293 (patch) | |
| tree | 431d772cf78f18f540f19ac2a6dfe784a1b4e636 | |
| parent | re-enable POOL_DEBUG after release; ok deraadt@ (diff) | |
| download | wireguard-openbsd-854b8769c65c9581b6480f98008c305517664293.tar.xz wireguard-openbsd-854b8769c65c9581b6480f98008c305517664293.zip | |
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) |