[GIT PULL] timers/nohz fix

Ingo Molnar
2017-02-11T18:15:31Z

Linus,

Please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

# HEAD: 7bdb59f1ad474bd7161adc8f923cdef10f2638d1 tick/nohz: Fix possible missing clock reprog after tick soft restart

Fix a sporadic missed timer hw reprogramming bug that can result in random delays.

Thanks,

Ingo

------------------>
Frederic Weisbecker (1):
tick/nohz: Fix possible missing clock reprog after tick soft restart

kernel/time/tick-sched.c | 5 +++++
1 file changed, 5 insertions(+)

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;
}
}