Skip to content

Commit fdb0ee7

Browse files
committed
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
2 parents d5b76be + 7bdb59f commit fdb0ee7

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

kernel/time/tick-sched.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,11 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
725725
*/
726726
if (delta == 0) {
727727
tick_nohz_restart(ts, now);
728+
/*
729+
* Make sure next tick stop doesn't get fooled by past
730+
* clock deadline
731+
*/
732+
ts->next_tick = 0;
728733
goto out;
729734
}
730735
}

0 commit comments

Comments
 (0)