Commit fdb0ee7c authored Feb 11, 2017 by Linus Torvalds

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

parents d5b76bef 7bdb59f1

kernel/time/tick-sched.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}