[PATCH 2/2] rcu: fix sparse shadowed variable warning

From: Harvey Harrison
Date: Tue Aug 26 2008 - 16:01:14 EST


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@xxxxxxxxx>
---
It would be safe in this case to just remove the second declaration of flags
and reuse it as it is outside the local_irq_save/restore pair. I did it this
way in case there are future changes that might mix up the use of flags.

Feel free to just remove the second flags declaration if you'd rather do it
that way.

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);
}
}

--
1.6.0.340.g84854

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/