svn commit: r313865 - head/sys/kern

Mateusz Guzik mjg at FreeBSD.org
Fri Feb 17 10:58:14 UTC 2017


Author: mjg
Date: Fri Feb 17 10:58:12 2017
New Revision: 313865
URL: https://svnweb.freebsd.org/changeset/base/313865

Log:
  sx: fix compilation on UP kernels after r313855
  
  sx primitives use inlines as opposed to macros. Change the tested condition
  to LOCK_DEBUG which covers the case, but is slightly overzelaous.
  
  Reported by:	kib

Modified:
  head/sys/kern/kern_sx.c

Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c	Fri Feb 17 08:25:48 2017	(r313864)
+++ head/sys/kern/kern_sx.c	Fri Feb 17 10:58:12 2017	(r313865)
@@ -364,7 +364,7 @@ _sx_xunlock(struct sx *sx, const char *f
 	WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file,
 	    line);
-#ifdef LOCK_PROFILING
+#if LOCK_DEBUG > 0
 	_sx_xunlock_hard(sx, (uintptr_t)curthread, file, line);
 #else
 	__sx_xunlock(sx, curthread, file, line);


More information about the svn-src-all mailing list