aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/rcupdate.h4
-rw-r--r--kernel/sysctl.c3
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
45extern 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
88extern int sysctl_nr_trim_pages; 88extern int sysctl_nr_trim_pages;
89#endif 89#endif
90#ifdef CONFIG_RCU_TORTURE_TEST
91extern int rcutorture_runnable;
92#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
93#ifdef CONFIG_BLOCK 90#ifdef CONFIG_BLOCK
94extern int blk_iopoll_enabled; 91extern int blk_iopoll_enabled;
95#endif 92#endif