From 9ba567a07c75f0f1351e4c14d0c1ab100ae91161 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 25 Sep 2001 23:51:54 +0000
Subject: [PATCH] Move the definition of LOCK_DEBUG from sys/lock.h to
 sys/_lock.h.

---
 sys/sys/_lock.h | 16 ++++++++++++++++
 sys/sys/lock.h  | 13 -------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/sys/sys/_lock.h b/sys/sys/_lock.h
index cc035df54ba..9841f45d565 100644
--- a/sys/sys/_lock.h
+++ b/sys/sys/_lock.h
@@ -31,6 +31,22 @@
 #ifndef _SYS_LOCK_TYPES_H_
 #define	_SYS_LOCK_TYPES_H_
 
+#ifdef _KERNEL
+/*
+ * If any of WITNESS, INVARIANTS, or KTR_LOCK KTR tracing has been enabled,
+ * then turn on LOCK_DEBUG.  When this option is on, extra debugging
+ * facilities such as tracking the file and line number of lock operations
+ * are enabled.  Also, mutex locking operations are not inlined to avoid
+ * bloat from all the extra debugging code.  We also have to turn on all the
+ * 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(KTR) && (KTR_COMPILE & KTR_LOCK))
+#define	LOCK_DEBUG
+#endif
+
+#endif /* _KERNEL */
+
 struct lock_object {
 	struct	lock_class *lo_class;
 	const	char *lo_name;
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index f77395995f2..51fcac3570e 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -123,19 +123,6 @@ struct lock_list_entry {
 	u_int	ll_count;
 };
 
-/*
- * If any of WITNESS, INVARIANTS, or KTR_LOCK KTR tracing has been enabled,
- * then turn on LOCK_DEBUG.  When this option is on, extra debugging
- * facilities such as tracking the file and line number of lock operations
- * are enabled.  Also, mutex locking operations are not inlined to avoid
- * bloat from all the extra debugging code.  We also have to turn on all the
- * 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(KTR) && (KTR_COMPILE & KTR_LOCK))
-#define	LOCK_DEBUG
-#endif
-
 /*
  * In the LOCK_DEBUG case, use the filename and line numbers for debugging
  * operations.  Otherwise, use default values to avoid the unneeded bloat.
-- 
2.45.2