1 files changed, 9 insertions, 0 deletions

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index f4fc867f467d..3483e6cb9549 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -217,6 +217,14 @@ void tick_nohz_stop_sched_tick(void)
                  * the scheduler tick in nohz_restart_sched_tick.
                  */
                 if (!ts->tick_stopped) {
+                        if (select_nohz_load_balancer(1)) {
+                                /*
+                                 * sched tick not stopped!
+                                 */
+                                cpu_clear(cpu, nohz_cpu_mask);
+                                goto out;
+                        }
+
                         ts->idle_tick = ts->sched_timer.expires;
                         ts->tick_stopped = 1;
                         ts->idle_jiffies = last_jiffies;
@@ -285,6 +293,7 @@ void tick_nohz_restart_sched_tick(void)
         now = ktime_get();
 
         local_irq_disable();
+        select_nohz_load_balancer(0);
         tick_do_update_jiffies64(now);
         cpu_clear(cpu, nohz_cpu_mask);