diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-04-14 08:36:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-04-14 08:36:41 +0200 |
| commit | 40e7d7bdc19e65a356ca6d692c6e56ec45012737 (patch) | |
| tree | af01b8ec9a914c5677c37702f6dfb83470260e73 /kernel | |
| parent | 8f3d9f354286745c751374f5f1fcafee6b3f3136 (diff) | |
| parent | bf37da98c51825c90432d340e135cced37a7460d (diff) | |
| download | linux-40e7d7bdc19e65a356ca6d692c6e56ec45012737.tar.bz2 | |
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 <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rcu/tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 06548e2ebb72..d9a49cd6065a 100644 --- 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)) { |