From 69c486fddc37d75ce4928201a31f0d806eba07eb Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Wed, 27 Feb 2008 16:21:10 -0800
Subject: [PATCH] --- yaml --- r: 86604 b: refs/heads/master c:
 ae778869ae4549628b9e83efe958c3aaa63ed1b9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c7dea8244969..8cc8cfc71e60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 076d84bbdb396360d16aaa108c55aa1e24ad47a3
+refs/heads/master: ae778869ae4549628b9e83efe958c3aaa63ed1b9
diff --git a/trunk/kernel/rcupreempt.c b/trunk/kernel/rcupreempt.c
index c7c52096df48..845abcd472b0 100644
--- a/trunk/kernel/rcupreempt.c
+++ b/trunk/kernel/rcupreempt.c
@@ -918,8 +918,9 @@ void rcu_offline_cpu(int cpu)
 	 * fix.
 	 */
 
+	local_irq_save(flags);
 	rdp = RCU_DATA_ME();
-	spin_lock_irqsave(&rdp->lock, flags);
+	spin_lock(&rdp->lock);
 	*rdp->nexttail = list;
 	if (list)
 		rdp->nexttail = tail;