From bc8223224be5cec4f61ac0093ab6dd4ac8125d4f Mon Sep 17 00:00:00 2001
From: Nick Piggin <nickpiggin@yahoo.com.au>
Date: Thu, 10 Jul 2008 17:25:35 +1000
Subject: [PATCH] --- yaml --- r: 98806 b: refs/heads/master c:
 70ff05554f91a1edda1f11684da1dbde09e2feea h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/rcupreempt.c | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index bd78229b8d7f..75bb292f4439 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb6d42ea17329745d7d712d3aa3bb84ec1da9c85
+refs/heads/master: 70ff05554f91a1edda1f11684da1dbde09e2feea
diff --git a/trunk/kernel/rcupreempt.c b/trunk/kernel/rcupreempt.c
index 5e02b7740702..41d275a81df5 100644
--- a/trunk/kernel/rcupreempt.c
+++ b/trunk/kernel/rcupreempt.c
@@ -925,26 +925,22 @@ void rcu_offline_cpu(int cpu)
 	spin_unlock_irqrestore(&rdp->lock, flags);
 }
 
-void __devinit rcu_online_cpu(int cpu)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&rcu_ctrlblk.fliplock, flags);
-	cpu_set(cpu, rcu_cpu_online_map);
-	spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags);
-}
-
 #else /* #ifdef CONFIG_HOTPLUG_CPU */
 
 void rcu_offline_cpu(int cpu)
 {
 }
 
-void __devinit rcu_online_cpu(int cpu)
+#endif /* #else #ifdef CONFIG_HOTPLUG_CPU */
+
+void __cpuinit rcu_online_cpu(int cpu)
 {
-}
+	unsigned long flags;
 
-#endif /* #else #ifdef CONFIG_HOTPLUG_CPU */
+	spin_lock_irqsave(&rcu_ctrlblk.fliplock, flags);
+	cpu_set(cpu, rcu_cpu_online_map);
+	spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags);
+}
 
 static void rcu_process_callbacks(struct softirq_action *unused)
 {