From 6b2fc7270c7ace91387d983bbc7bd610950da2a2 Mon Sep 17 00:00:00 2001
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Date: Mon, 18 Aug 2008 21:49:51 -0700
Subject: [PATCH] --- yaml --- r: 110777 b: refs/heads/master c:
 0c925d79234fe77589d8ff3861f9f8bb9e7fc3f6 h: refs/heads/master i:   110775:
 6e43a8b173e75e9ce869a5c464bb74bbb84b30f5 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/rcuclassic.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89b971524397..719947241fc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eff9b713ee3540ddab862095aaf4b1511a6758bc
+refs/heads/master: 0c925d79234fe77589d8ff3861f9f8bb9e7fc3f6
diff --git a/trunk/kernel/rcuclassic.c b/trunk/kernel/rcuclassic.c
index c6b6cf55f3e2..01e761a6b38c 100644
--- a/trunk/kernel/rcuclassic.c
+++ b/trunk/kernel/rcuclassic.c
@@ -557,6 +557,8 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp,
 		local_irq_enable();
 
 		if (rcu_batch_after(rdp->batch, rcp->pending)) {
+			unsigned long flags;
+
 			/* and start it/schedule start if it's a new batch */
 			spin_lock_irqsave(&rcp->lock, flags);
 			if (rcu_batch_after(rdp->batch, rcp->pending)) {