summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1997-03-25 16:38:01 +0000
committerpeter <peter@FreeBSD.org>1997-03-25 16:38:01 +0000
commit57b19c0bcafbda481e808339fea2adb184bbbdfa (patch)
tree52c12f4dae71fafd5dfbd6d0cfab14e836cb4456 /sys/kern
parentaef498c3beed3f425992f1f6188c8b332cd92ec6 (diff)
downloadFreeBSD-src-57b19c0bcafbda481e808339fea2adb184bbbdfa.zip
FreeBSD-src-57b19c0bcafbda481e808339fea2adb184bbbdfa.tar.gz
Replace original rev 1.3; Author: bde; Date: 1997/02/25 17:24:43;
Fix counting of simplelocks in SIMPLELOCK_DEBUG Fix style regression
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_lock.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 7e8a55b..8938a14 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -48,7 +48,7 @@
* Locks provide shared/exclusive sychronization.
*/
-#ifdef DEBUG
+#ifdef SIMPLELOCK_DEBUG
#define COUNT(p, x) if (p) (p)->p_locks += (x)
#else
#define COUNT(p, x)
@@ -171,9 +171,8 @@ lockmgr(lkp, flags, interlkp, p)
else
pid = LK_KERNPROC;
simple_lock(&lkp->lk_interlock);
- if (flags & LK_INTERLOCK) {
+ if (flags & LK_INTERLOCK)
simple_unlock(interlkp);
- }
extflags = (flags | lkp->lk_flags) & LK_EXTFLG_MASK;
#ifdef DIAGNOSTIC
/*
OpenPOWER on IntegriCloud