aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcuclassic.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-09-22 17:55:46 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-23 05:04:30 -0400
commit3a72dc8eb5a7122fff439a22bd22486a4fff505c (patch)
treeed7925a0f0fdb82ca6430a92b733a1e111bd0b9d /kernel/rcuclassic.c
parente8aed68614c81f24d8c4cbcb4923f848ece846e1 (diff)
rcu: fix sparse shadowed variable warning
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>
Diffstat (limited to 'kernel/rcuclassic.c')
-rw-r--r--kernel/rcuclassic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c
index 743cf0550ff4..ed15128ca2c9 100644
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
@@ -561,15 +561,15 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp,
561 local_irq_restore(flags); 561 local_irq_restore(flags);
562 562
563 if (rcu_batch_after(rdp->batch, rcp->pending)) { 563 if (rcu_batch_after(rdp->batch, rcp->pending)) {
564 unsigned long flags; 564 unsigned long flags2;
565 565
566 /* and start it/schedule start if it's a new batch */ 566 /* and start it/schedule start if it's a new batch */
567 spin_lock_irqsave(&rcp->lock, flags); 567 spin_lock_irqsave(&rcp->lock, flags2);
568 if (rcu_batch_after(rdp->batch, rcp->pending)) { 568 if (rcu_batch_after(rdp->batch, rcp->pending)) {
569 rcp->pending = rdp->batch; 569 rcp->pending = rdp->batch;
570 rcu_start_batch(rcp); 570 rcu_start_batch(rcp);
571 } 571 }
572 spin_unlock_irqrestore(&rcp->lock, flags); 572 spin_unlock_irqrestore(&rcp->lock, flags2);
573 } 573 }
574 } 574 }
575 575