---

yaml --- r: 86605 b: refs/heads/master c: c9e7100 h: refs/heads/master i: 86603: 396db40 v: v3
git-mirror · Feb 29, 2008 · b294e38 · b294e38
1 parent 69c486f
commit b294e38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae778869ae4549628b9e83efe958c3aaa63ed1b9
+refs/heads/master: c9e71002aacc9821e99531dcc130db88bbc8ad05
diff --git a/trunk/kernel/rcupreempt.c b/trunk/kernel/rcupreempt.c
@@ -952,9 +952,11 @@ static void rcu_process_callbacks(struct softirq_action *unused)
 {
 	unsigned long flags;
 	struct rcu_head *next, *list;
-	struct rcu_data *rdp = RCU_DATA_ME();
+	struct rcu_data *rdp;
 
-	spin_lock_irqsave(&rdp->lock, flags);
+	local_irq_save(flags);
+	rdp = RCU_DATA_ME();
+	spin_lock(&rdp->lock);
 	list = rdp->donelist;
 	if (list == NULL) {
 		spin_unlock_irqrestore(&rdp->lock, flags);