Commit 56fd16ca authored Oct 16, 2015 by Thomas Gleixner

timekeeping: Increment clock_was_set_seq in timekeeping_init()



timekeeping_init() can set the wall time offset, so we need to
increment the clock_was_set_seq counter. That way hrtimers will pick
up the early offset immediately. Otherwise on a machine which does not
set wall time later in the boot process the hrtimer offset is stale at
0 and wall time timers are going to expire with a delay of 45 years.

Fixes: 868a3e91 "hrtimer: Make offset update smarter"
Reported-and-tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Stefan Liebler <stli@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>

parent 25cb62b7

kernel/time/timekeeping.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1251,7 +1251,7 @@ void __init timekeeping_init(void)
	set_normalized_timespec64(&tmp, -boot.tv_sec, -boot.tv_nsec);		set_normalized_timespec64(&tmp, -boot.tv_sec, -boot.tv_nsec);
	tk_set_wall_to_mono(tk, tmp);		tk_set_wall_to_mono(tk, tmp);

	timekeeping_update(tk, TK_MIRROR);		timekeeping_update(tk, TK_MIRROR \| TK_CLOCK_WAS_SET);

	write_seqcount_end(&tk_core.seq);		write_seqcount_end(&tk_core.seq);
	raw_spin_unlock_irqrestore(&timekeeper_lock, flags);		raw_spin_unlock_irqrestore(&timekeeper_lock, flags);