Skip to content

Commit 40e7d7b

Browse files
author
Ingo Molnar
committed
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]>
2 parents 8f3d9f3 + bf37da9 commit 40e7d7b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/rcu/tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq)
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)) {

0 commit comments

Comments
 (0)