Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a72dc8e authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

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: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e8aed686

kernel/rcuclassic.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

		}

	}