From d7b7cd3976c5236aac4f23dde287e37879bf8a5c Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Thu, 14 Jan 2010 16:10:58 -0800
Subject: [PATCH] --- yaml --- r: 182239 b: refs/heads/master c:
 017c426138122c8e9b9f5057fbd0567c37b35247 h: refs/heads/master i:   182237:
 00fccdc695dd2717ce93243dacb7eadc89063307   182235:
 39549bda8fec78dd955fcb736d6eb9616eac9dac   182231:
 4d0c6edc378e558756dc6e80d6f85732f303d9ce   182223:
 7ead65c71ac27339cfd4e881937ef200b123e636   182207:
 410141c50ec5e442e01fe28a2d8e4cabd66fd338 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/rcutree.c | 6 +++---
 trunk/kernel/rcutree.h | 6 ++----
 trunk/kernel/srcu.c    | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index baa490fe8d3e..d8a95c79fdd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c54005ca438a8b46dd542b497d4f0dc2ca375e8
+refs/heads/master: 017c426138122c8e9b9f5057fbd0567c37b35247
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
index 3b13d64b010b..099a255ede4c 100644
--- a/trunk/kernel/rcutree.c
+++ b/trunk/kernel/rcutree.c
@@ -1888,7 +1888,7 @@ do { \
 
 void __init rcu_init(void)
 {
-	int i;
+	int cpu;
 
 	rcu_bootup_announce();
 #ifdef CONFIG_RCU_CPU_STALL_DETECTOR
@@ -1908,8 +1908,8 @@ void __init rcu_init(void)
 	 * or the scheduler are operational.
 	 */
 	cpu_notifier(rcu_cpu_notify, 0);
-	for_each_online_cpu(i)
-		rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)i);
+	for_each_online_cpu(cpu)
+		rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)cpu);
 }
 
 #include "rcutree_plugin.h"
diff --git a/trunk/kernel/rcutree.h b/trunk/kernel/rcutree.h
index bd5d78ad1c48..d9d032abd665 100644
--- a/trunk/kernel/rcutree.h
+++ b/trunk/kernel/rcutree.h
@@ -323,8 +323,6 @@ struct rcu_state {
 #define RCU_OFL_TASKS_EXP_GP	0x2		/* Tasks blocking expedited */
 						/*  GP were moved to root. */
 
-#ifdef RCU_TREE_NONCORE
-
 /*
  * RCU implementation internal declarations:
  */
@@ -339,7 +337,7 @@ extern struct rcu_state rcu_preempt_state;
 DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data);
 #endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */
 
-#else /* #ifdef RCU_TREE_NONCORE */
+#ifndef RCU_TREE_NONCORE
 
 /* Forward declarations for rcutree_plugin.h */
 static void rcu_bootup_announce(void);
@@ -372,4 +370,4 @@ static void __cpuinit rcu_preempt_init_percpu_data(int cpu);
 static void rcu_preempt_send_cbs_to_orphanage(void);
 static void __init __rcu_init_preempt(void);
 
-#endif /* #else #ifdef RCU_TREE_NONCORE */
+#endif /* #ifndef RCU_TREE_NONCORE */
diff --git a/trunk/kernel/srcu.c b/trunk/kernel/srcu.c
index 818d7d9aa03c..31b275b9c112 100644
--- a/trunk/kernel/srcu.c
+++ b/trunk/kernel/srcu.c
@@ -144,7 +144,7 @@ EXPORT_SYMBOL_GPL(srcu_read_unlock);
 /*
  * Helper function for synchronize_srcu() and synchronize_srcu_expedited().
  */
-void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void))
+static void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void))
 {
 	int idx;