summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_lock.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2014-11-02 19:51:33 +0000
committerkib <kib@FreeBSD.org>2014-11-02 19:51:33 +0000
commitd83157092eabca2654d32c67864a38b397af0bbb (patch)
tree46edbd389dc613e1849e9607c4bef1ca7d46ea5f /sys/kern/kern_lock.c
parent0bd39a418ef1ed6dcebaddd24fbef5e89c86e6b4 (diff)
downloadFreeBSD-src-d83157092eabca2654d32c67864a38b397af0bbb.zip
FreeBSD-src-d83157092eabca2654d32c67864a38b397af0bbb.tar.gz
Followup to r273966. Fix the build with ADAPTIVE_LOCKMGRS kernel option.
Note that the option is currently not used in any in-tree kernel configs, including LINTs. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks
Diffstat (limited to 'sys/kern/kern_lock.c')
-rw-r--r--sys/kern/kern_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 24d94cc..d0e0bdd 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -615,7 +615,7 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk,
__func__, lk, spintries, i);
x = lk->lk_lock;
if ((x & LK_SHARE) == 0 ||
- LK_CAN_SHARE(x) != 0)
+ LK_CAN_SHARE(x, flags) != 0)
break;
cpu_spinwait();
}
OpenPOWER on IntegriCloud