---

yaml --- r: 187319 b: refs/heads/master c: 2edf5e4 h: refs/heads/master i: 187317: 56bc763 187315: d8b5d39 187311: d66bd0d v: v3
git-mirror · Mar 12, 2010 · a331866 · a331866
1 parent a2d69b7
commit a331866
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f0e056fdebc15d3f4724ebc7bbf323158add1d7
+refs/heads/master: 2edf5e49800846a2b2b6461d99cdae18067c440f
diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h
@@ -12,6 +12,10 @@
 struct task_struct;
 struct lockdep_map;
 
+/* for sysctl */
+extern int prove_locking;
+extern int lock_stat;
+
 #ifdef CONFIG_LOCKDEP
 
 #include <linux/linkage.h>

diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
@@ -67,6 +67,9 @@
 #ifdef CONFIG_RT_MUTEXES
 #include <linux/rtmutex.h>
 #endif
+#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+#include <linux/lockdep.h>
+#endif
 #ifdef CONFIG_CHR_DEV_SG
 #include <scsi/sg.h>
 #endif
@@ -191,9 +194,6 @@ extern struct ctl_table epoll_table[];
 int sysctl_legacy_va_layout;
 #endif
 
-extern int prove_locking;
-extern int lock_stat;
-
 /* The default sysctl tables: */
 
 static struct ctl_table root_table[] = {