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: Ingo Molnar <[email protected]>
ambv · Apr 14, 2020 · 40e7d7b · 40e7d7b
2 parents 8f3d9f3 + bf37da9
commit 40e7d7b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
@@ -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)) {