svn commit: r273986 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sun Nov  2 19:51:33 2014
New Revision: 273986
URL: https://svnweb.freebsd.org/changeset/base/273986

Log:
  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

Modified:
  head/sys/kern/kern_lock.c

Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c	Sun Nov  2 19:25:31 2014	(r273985)
+++ head/sys/kern/kern_lock.c	Sun Nov  2 19:51:33 2014	(r273986)
@@ -615,7 +615,7 @@ __lockmgr_args(struct lock *lk, u_int fl
 						    __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();
 				}