From c0dadb995511f7a244af3dc0ae221d626a44677c Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 15 Nov 2000 22:00:31 +0000 Subject: [PATCH] Don't perform witness checks in witness_enter() during a panic. --- sys/kern/kern_mutex.c | 2 +- sys/kern/subr_turnstile.c | 2 +- sys/kern/subr_witness.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 86fa1e487085..4e5376632b5f 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -829,7 +829,7 @@ witness_enter(struct mtx *m, int flags, const char *file, int line) return; if (witness_dead) goto out; - if (cold) + if (cold || panicstr) goto out; if (!mtx_legal2block()) diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c index 86fa1e487085..4e5376632b5f 100644 --- a/sys/kern/subr_turnstile.c +++ b/sys/kern/subr_turnstile.c @@ -829,7 +829,7 @@ witness_enter(struct mtx *m, int flags, const char *file, int line) return; if (witness_dead) goto out; - if (cold) + if (cold || panicstr) goto out; if (!mtx_legal2block()) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 86fa1e487085..4e5376632b5f 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -829,7 +829,7 @@ witness_enter(struct mtx *m, int flags, const char *file, int line) return; if (witness_dead) goto out; - if (cold) + if (cold || panicstr) goto out; if (!mtx_legal2block())