Merge commit 'origin' into devel

1 files changed, 3 insertions, 0 deletions

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index fa9bb73dbdb4..2968298f8f36 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -282,6 +282,7 @@ void tick_nohz_stop_sched_tick(void)
                         ts->idle_tick = ts->sched_timer.expires;
                         ts->tick_stopped = 1;
                         ts->idle_jiffies = last_jiffies;
+                        rcu_enter_nohz();
                 }
 
                 /*
@@ -375,6 +376,8 @@ void tick_nohz_restart_sched_tick(void)
                 return;
         }
 
+        rcu_exit_nohz();
+
         /* Update jiffies first */
         select_nohz_load_balancer(0);
         now = ktime_get();