2010-02-20 14:21:34

by Dave Young

[permalink] [raw]
Subject: [PATCH 16/18] sysctl extern cleanup - lockdep

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 <[email protected]>
---
include/linux/lockdep.h | 5 +++++
kernel/sysctl.c | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)

--- linux-2.6.32.orig/include/linux/lockdep.h 2010-02-20 14:02:16.481592295 +0800
+++ linux-2.6.32/include/linux/lockdep.h 2010-02-20 14:42:48.091351691 +0800
@@ -11,6 +11,11 @@

struct task_struct;
struct lockdep_map;
+#ifdef CONFIG_SYSCTL
+extern int prove_locking;
+extern int lock_stat;
+#endif
+

#ifdef CONFIG_LOCKDEP

--- linux-2.6.32.orig/kernel/sysctl.c 2010-02-20 14:40:24.232197892 +0800
+++ linux-2.6.32/kernel/sysctl.c 2010-02-20 14:41:41.625522844 +0800
@@ -64,6 +64,7 @@
#include <linux/blk-iopoll.h>
#include <linux/acct.h>
#include <linux/rtmutex.h>
+#include <linux/lockdep.h>
#include <scsi/sg.h>

#include <asm/uaccess.h>
@@ -165,9 +166,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[] = {