Commit 40e7d7bd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'urgent-for-mingo' of... 

Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

 into core/urgent

Pull RCU fix from Paul E. McKenney.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8f3d9f35 bf37da98

kernel/rcu/tree.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq) 
			rcu_cleanup_after_idle();



		incby = 1;

	} else if (tick_nohz_full_cpu(rdp->cpu) &&

	} else if (irq && tick_nohz_full_cpu(rdp->cpu) &&

		   rdp->dynticks_nmi_nesting == DYNTICK_IRQ_NONIDLE &&

		   READ_ONCE(rdp->rcu_urgent_qs) &&

		   !READ_ONCE(rdp->rcu_forced_tick)) {