svn commit: r314476 - head/sys/sys

[Mateusz Guzik]

Author: mjg
Date: Wed Mar  1 05:18:22 2017
New Revision: 314476
URL: https://svnweb.freebsd.org/changeset/base/314476

Log:
  locks: fix compilation with KTR wihout KTR_LOCKS
  
  While here wrap the overly long line.
  
  Reported by:	np

Modified:
  head/sys/sys/lock.h

Modified: head/sys/sys/lock.h
==============================================================================
--- head/sys/sys/lock.h	Wed Mar  1 05:14:45 2017	(r314475)
+++ head/sys/sys/lock.h	Wed Mar  1 05:18:22 2017	(r314476)
@@ -125,7 +125,8 @@ struct lock_class {
  * calling conventions for this debugging code in modules so that modules can
  * work with both debug and non-debug kernels.
  */
-#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(LOCK_PROFILING) || (defined(KTR) && (KTR_COMPILE & KTR_LOCK))
+#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || \
+    defined(INVARIANT_SUPPORT) || defined(LOCK_PROFILING) || defined(KTR)
 #define	LOCK_DEBUG	1
 #else
 #define	LOCK_DEBUG	0