[PATCH -mm 15/17] sysctl extern cleanup - lockdep
From: Dave Young
Date: Sun Feb 21 2010 - 09:31:47 EST
Extern declarations in sysctl.c should be move to their own head file,
and then include them in relavant .c files.
Move lockdep extern declarations to linux/lockdep.h
Signed-off-by: Dave Young <hidave.darkstar@xxxxxxxxx>
---
include/linux/lockdep.h | 4 ++++
kernel/sysctl.c | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
--- linux-2.6.32.orig/include/linux/lockdep.h 2010-02-21 11:12:12.463446879 +0800
+++ linux-2.6.32/include/linux/lockdep.h 2010-02-21 11:22:50.809216778 +0800
@@ -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>
--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-21 11:22:37.322552208 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-21 11:23:13.929215242 +0800
@@ -69,6 +69,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
@@ -175,9 +178,6 @@ extern struct ctl_table inotify_table[];
extern struct ctl_table epoll_table[];
#endif
-extern int prove_locking;
-extern int lock_stat;
-
/* The default sysctl tables: */
static struct ctl_table root_table[] = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/