From 92f29c16f4a1eb5f6d3f198a67c578acc1f9e0bd Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Wed, 10 Mar 2010 15:24:05 -0800
Subject: [PATCH] --- yaml --- r: 187314 b: refs/heads/master c:
 e5ab67726f33b50f40db0ccf271ceb3c658554d5 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/rcupdate.h | 4 ++++
 trunk/kernel/sysctl.c          | 3 ---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 027192d1a3ce..f3ed362ba455 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d33ed52d57e794eba55cea3f5eab3c8f80b6cb5a
+refs/heads/master: e5ab67726f33b50f40db0ccf271ceb3c658554d5
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index c84373626336..a005cac5e302 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -41,6 +41,10 @@
 #include <linux/lockdep.h>
 #include <linux/completion.h>
 
+#ifdef CONFIG_RCU_TORTURE_TEST
+extern int rcutorture_runnable; /* for sysctl */
+#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
+
 /**
  * struct rcu_head - callback structure for use with RCU
  * @next: next update requests in a list
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index a8fd10a9a501..f18aaa7b0d65 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -87,9 +87,6 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
 #ifndef CONFIG_MMU
 extern int sysctl_nr_trim_pages;
 #endif
-#ifdef CONFIG_RCU_TORTURE_TEST
-extern int rcutorture_runnable;
-#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */
 #ifdef CONFIG_BLOCK
 extern int blk_iopoll_enabled;
 #endif