diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-11 19:24:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-11 19:24:16 +0100 |
| commit | fdb0ee7c65781464168e2943a3fd6f1e66a397c9 (patch) | |
| tree | 4c1e8f5d1be9b34087f29d76577d8e6ec40962e1 /kernel | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | tick/nohz: Fix possible missing clock reprog after tick soft restart (diff) | |
| download | linux-fdb0ee7c65781464168e2943a3fd6f1e66a397c9.tar.xz linux-fdb0ee7c65781464168e2943a3fd6f1e66a397c9.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Fix a sporadic missed timer hw reprogramming bug that can result in
random delays"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick/nohz: Fix possible missing clock reprog after tick soft restart
Diffstat (limited to 'kernel')
| -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; } } |