diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-16 15:50:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:53:43 +0900 |
| commit | 31a07f6dc6f16fafab8bebd673e653299bd03c93 (patch) | |
| tree | e5cb276141db05461fb8c2ebee1af71550aadb22 | |
| parent | 0c6eb5c35590b5105e4307c896f1c14e6e1e4915 (diff) | |
| download | lwn-31a07f6dc6f16fafab8bebd673e653299bd03c93.tar.gz lwn-31a07f6dc6f16fafab8bebd673e653299bd03c93.zip | |
timekeeping: Increment clock_was_set_seq in timekeeping_init()
commit 56fd16cabac9cd8f15e2902898a9d0cc96e2fa70 upstream.
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: 868a3e915f7f "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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index a20d4110e871..3688f1e07ebd 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1244,7 +1244,7 @@ void __init timekeeping_init(void) set_normalized_timespec64(&tmp, -boot.tv_sec, -boot.tv_nsec); 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); raw_spin_unlock_irqrestore(&timekeeper_lock, flags); |