aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Young <hidave.darkstar@gmail.com>2010-03-10 15:24:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 15:53:10 -0800
commit2edf5e49800846a2b2b6461d99cdae18067c440f (patch)
treea03fc295676a23c30ae467ba96a1efaf5762dd90
parent4f0e056fdebc15d3f4724ebc7bbf323158add1d7 (diff)
sysctl extern cleanup: lockdep
Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move lockdep extern declarations to linux/lockdep.h Signed-off-by: Dave Young <hidave.darkstar@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/lockdep.h4
-rw-r--r--kernel/sysctl.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 10206a87da1..a03977a96d7 100644
--- a/include/linux/lockdep.h
+++ b/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/kernel/sysctl.c b/kernel/sysctl.c
index 622029ba510..8686b0f5fc1 100644
--- a/kernel/sysctl.c
+++ b/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[] = {