diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-04-03 08:58:06 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-04-03 08:58:06 +0000 |
| commit | be96f2ecec68c3ad901d3afec161d6129ecd081f (patch) | |
| tree | 4b5f98ee691eeada36398b7fcbc39f919ec79e22 /sys | |
| parent | 86edb00e31ddb2f19ce5d2f91d64289c5e0f2625 (diff) | |
Silence assertwaitok() if we are in ddb(4).
ok bluhm@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/subr_xxx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c index 4ffcdd54e0e..0ecc0b060f2 100644 --- a/sys/kern/subr_xxx.c +++ b/sys/kern/subr_xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_xxx.c,v 1.15 2015/12/05 10:11:53 tedu Exp $ */ +/* $OpenBSD: subr_xxx.c,v 1.16 2018/04/03 08:58:05 mpi Exp $ */ /* $NetBSD: subr_xxx.c,v 1.10 1996/02/04 02:16:51 christos Exp $ */ /* @@ -155,6 +155,9 @@ blktochr(dev_t dev) void assertwaitok(void) { + if (panicstr || db_active) + return; + splassert(IPL_NONE); #ifdef DIAGNOSTIC if (curcpu()->ci_mutex_level != 0) |