nohz: Add hrtimer sanity check

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 64c97fc130c4db2f1241185d9075af7a0f5175f5..d212bb62bc08ca7a540fdd44a6aa5e7c01224fad 100644 (file)
--- 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