1 files changed, 7 insertions, 2 deletions

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 64c97fc130c4..d212bb62bc08 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -771,8 +771,13 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
         tick = expires;
 
         /* Skip reprogram of event if its not changed */
-        if (ts->tick_stopped && (expires == dev->next_event))
-                goto out;
+        if (ts->tick_stopped) {
+                if (hrtimer_active(&ts->sched_timer))
+                        WARN_ON_ONCE(hrtimer_get_expires(&ts->sched_timer) < dev->next_event);
+
+                if (expires == dev->next_event)
+                        goto out;
+        }
 
         /*
          * nohz_stop_sched_tick can be called several times before