diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-09-22 14:55:46 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 11:04:30 +0200 |
commit | 3a72dc8eb5a7122fff439a22bd22486a4fff505c (patch) | |
tree | ed7925a0f0fdb82ca6430a92b733a1e111bd0b9d /kernel | |
parent | e8aed68614c81f24d8c4cbcb4923f848ece846e1 (diff) | |
download | op-kernel-dev-3a72dc8eb5a7122fff439a22bd22486a4fff505c.zip op-kernel-dev-3a72dc8eb5a7122fff439a22bd22486a4fff505c.tar.gz |
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')
-rw-r--r-- | kernel/rcuclassic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c index 743cf05..ed15128 100644 --- a/kernel/rcuclassic.c +++ b/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); } } |