Merge branches 'pm-core', 'pm-qos' and 'pm-domains'

[linux-2.6-microblaze.git] / kernel / time / tick-sched.c

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 74e0388..fc6f740 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -725,6 +725,11 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
                 */
                if (delta == 0) {
                        tick_nohz_restart(ts, now);
+                       /*
+                        * Make sure next tick stop doesn't get fooled by past
+                        * clock deadline
+                        */
+                       ts->next_tick = 0;
                        goto out;
                }
        }