rcu: fix sparse shadowed variable warning
authorHarvey Harrison <harvey.harrison@gmail.com>
Mon, 22 Sep 2008 21:55:46 +0000 (14:55 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Sep 2008 09:04:30 +0000 (11:04 +0200)
kernel/rcuclassic.c:564:18: warning: symbol 'flags' shadows an earlier one
kernel/rcuclassic.c:527:16: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/rcuclassic.c

index 743cf05..ed15128 100644 (file)
@@ -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);
                }
        }