diff --git a/[refs] b/[refs]
index 5cf3d9e47e96..89a6315f0c9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8aed68614c81f24d8c4cbcb4923f848ece846e1
+refs/heads/master: 3a72dc8eb5a7122fff439a22bd22486a4fff505c
diff --git a/trunk/kernel/rcuclassic.c b/trunk/kernel/rcuclassic.c
index 743cf0550ff4..ed15128ca2c9 100644
--- a/trunk/kernel/rcuclassic.c
+++ b/trunk/kernel/rcuclassic.c
@@ -561,15 +561,15 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp,
 		local_irq_restore(flags);
 
 		if (rcu_batch_after(rdp->batch, rcp->pending)) {
-			unsigned long flags;
+			unsigned long flags2;
 
 			/* and start it/schedule start if it's a new batch */
-			spin_lock_irqsave(&rcp->lock, flags);
+			spin_lock_irqsave(&rcp->lock, flags2);
 			if (rcu_batch_after(rdp->batch, rcp->pending)) {
 				rcp->pending = rdp->batch;
 				rcu_start_batch(rcp);
 			}
-			spin_unlock_irqrestore(&rcp->lock, flags);
+			spin_unlock_irqrestore(&rcp->lock, flags2);
 		}
 	}