History

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.

Ingo Molnar committed 6 years ago

Commit 40e7d7b2 parents 8f3d9f3 bf37da91 file · +1 −1Browse files

Unified · Split

kernel/rcu/tree.c+1−1
@@ -825,7 +825,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq) · 824 unmodified lines
825825 rcu_cleanup_after_idle();
826826
827827 incby = 1;
828− } else if (tick_nohz_full_cpu(rdp->cpu) &&
828+ } else if (irq && tick_nohz_full_cpu(rdp->cpu) &&
829829 rdp->dynticks_nmi_nesting == DYNTICK_IRQ_NONIDLE &&
830830 READ_ONCE(rdp->rcu_urgent_qs) &&
831831 !READ_ONCE(rdp->rcu_forced_tick)) {