summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_fork.c
diff options
context:
space:
mode:
authoruebayasi <uebayasi@openbsd.org>2014-07-13 15:46:21 +0000
committeruebayasi <uebayasi@openbsd.org>2014-07-13 15:46:21 +0000
commitca86693be28e7194ad1cf3f628004f98c872ec26 (patch)
tree22a76b053ff4f3cdc168c0dcad1a598c82894ecc /sys/kern/kern_fork.c
parentOPENSSL_{malloc,free} -> {malloc,free} (diff)
downloadwireguard-openbsd-ca86693be28e7194ad1cf3f628004f98c872ec26.tar.xz
wireguard-openbsd-ca86693be28e7194ad1cf3f628004f98c872ec26.zip
KERNEL_ASSERT_LOCKED(9): Assertion for kernel lock (Rev. 3)
This adds a new assertion macro, KERNEL_ASSERT_LOCKED(), to assert that kernel_lock is held. In the long process of removing kernel_lock, there will be a lot (hundreds or thousands) of use of this; virtually almost all functions in !MP-safe subsystems should have this assertion. Thus this assertion should have a short, good name. Not only that "KERNEL_ASSERT_LOCKED" is consistent with other KERNEL_* and SCHED_ASSERT_LOCKED() macros. Input from dlg@ guenther@ kettenis@. OK dlg@ guenther@
Diffstat (limited to 'sys/kern/kern_fork.c')
-rw-r--r--sys/kern/kern_fork.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 2e035f17ab2..3efa176192b 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_fork.c,v 1.172 2014/07/12 18:43:32 tedu Exp $ */
+/* $OpenBSD: kern_fork.c,v 1.173 2014/07/13 15:46:21 uebayasi Exp $ */
/* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */
/*
@@ -614,7 +614,7 @@ proc_trampoline_mp(void)
__mp_unlock(&sched_lock);
spl0();
SCHED_ASSERT_UNLOCKED();
- KASSERT(__mp_lock_held(&kernel_lock) == 0);
+ KERNEL_ASSERT_UNLOCKED();
KERNEL_LOCK();
}