---

yaml --- r: 110774 b: refs/heads/master c: cd95851 h: refs/heads/master v: v3
git-mirror · Aug 17, 2008 · ab88314 · ab88314
1 parent 979830b
commit ab88314
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: 5802294f1b1895ee19a3d0ae72805da453afb9de
+refs/heads/master: cd95851785bcfe95fdf73689e8ecb5a1c5959231
diff --git a/trunk/kernel/rcuclassic.c b/trunk/kernel/rcuclassic.c
@@ -700,15 +700,17 @@ void rcu_check_callbacks(int cpu, int user)
 static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
 						struct rcu_data *rdp)
 {
-	spin_lock(&rcp->lock);
+	long flags;
+
+	spin_lock_irqsave(&rcp->lock, flags);
 	memset(rdp, 0, sizeof(*rdp));
 	rdp->nxttail[0] = rdp->nxttail[1] = rdp->nxttail[2] = &rdp->nxtlist;
 	rdp->donetail = &rdp->donelist;
 	rdp->quiescbatch = rcp->completed;
 	rdp->qs_pending = 0;
 	rdp->cpu = cpu;
 	rdp->blimit = blimit;
-	spin_unlock(&rcp->lock);
+	spin_unlock_irqrestore(&rcp->lock, flags);
 }
 
 static void __cpuinit rcu_online_cpu(int cpu)