diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-02-16 19:51:27 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-02-16 19:51:27 +0100 |
| commit | 5b1ad68f9b1951ef78312d2935906cc8a8bd2e12 (patch) | |
| tree | e81b71c961e885cef0d3992e083acec845166870 /kernel/time/tick-sched.c | |
| parent | 1013fe32a63d1139b1b32049ea46c0c462738d8b (diff) | |
| parent | 7089db84e356562f8ba737c29e472cc42d530dbc (diff) | |
Merge branch 'linus' into x86/mm
Make sure to get the latest fixes before applying the ptdump enhancements.
Diffstat (limited to 'kernel/time/tick-sched.c')
| -rw-r--r-- | kernel/time/tick-sched.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 74e0388cc88d..fc6f740d0277 100644 --- 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; } } |