diff options
author | Dave Young <hidave.darkstar@gmail.com> | 2010-03-10 18:24:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:53:08 -0500 |
commit | e5ab67726f33b50f40db0ccf271ceb3c658554d5 (patch) | |
tree | b4616f1f7e077f4dd4cc2586f0e8db8acd8a322b | |
parent | d33ed52d57e794eba55cea3f5eab3c8f80b6cb5a (diff) |
sysctl extern cleanup: rcu
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.
Move rcutorture_runnable extern declaration to linux/rcupdate.h
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Acked-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/rcupdate.h | 4 | ||||
-rw-r--r-- | kernel/sysctl.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index c84373626336..a005cac5e302 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
@@ -41,6 +41,10 @@ | |||
41 | #include <linux/lockdep.h> | 41 | #include <linux/lockdep.h> |
42 | #include <linux/completion.h> | 42 | #include <linux/completion.h> |
43 | 43 | ||
44 | #ifdef CONFIG_RCU_TORTURE_TEST | ||
45 | extern int rcutorture_runnable; /* for sysctl */ | ||
46 | #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ | ||
47 | |||
44 | /** | 48 | /** |
45 | * struct rcu_head - callback structure for use with RCU | 49 | * struct rcu_head - callback structure for use with RCU |
46 | * @next: next update requests in a list | 50 | * @next: next update requests in a list |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index a8fd10a9a501..f18aaa7b0d65 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -87,9 +87,6 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max; | |||
87 | #ifndef CONFIG_MMU | 87 | #ifndef CONFIG_MMU |
88 | extern int sysctl_nr_trim_pages; | 88 | extern int sysctl_nr_trim_pages; |
89 | #endif | 89 | #endif |
90 | #ifdef CONFIG_RCU_TORTURE_TEST | ||
91 | extern int rcutorture_runnable; | ||
92 | #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ | ||
93 | #ifdef CONFIG_BLOCK | 90 | #ifdef CONFIG_BLOCK |
94 | extern int blk_iopoll_enabled; | 91 | extern int blk_iopoll_enabled; |
95 | #endif | 92 | #endif |