summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2004-02-02 22:15:17 +0000
committerjhb <jhb@FreeBSD.org>2004-02-02 22:15:17 +0000
commit47cec231e3011299954763f8283c9ce5f07ec678 (patch)
tree77aebc357ff5fe500b5ebba0ce66c8d87eec18af /sys
parent955c424e128b14f3f21f9147362759322047b413 (diff)
downloadFreeBSD-src-47cec231e3011299954763f8283c9ce5f07ec678.zip
FreeBSD-src-47cec231e3011299954763f8283c9ce5f07ec678.tar.gz
- Assert that witness_cold is not true in enroll().
- Only check witness_watch once in enroll(). Reported by: ru (2)
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_witness.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index db3c55d..b5a37a2 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -1180,7 +1180,8 @@ enroll(const char *description, struct lock_class *lock_class)
{
struct witness *w;
- if (!witness_watch || witness_watch == 0 || panicstr != NULL)
+ KASSERT(!witness_cold, ("enroll called too early"));
+ if (witness_watch == 0 || panicstr != NULL)
return (NULL);
if ((lock_class->lc_flags & LC_SPINLOCK) && witness_skipspin)
return (NULL);
OpenPOWER on IntegriCloud