]> git.baikalelectronics.ru Git - kernel.git/commit
timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
authorJohn Stultz <john.stultz@linaro.org>
Wed, 30 May 2012 17:54:57 +0000 (10:54 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 4 Jun 2012 19:46:29 +0000 (21:46 +0200)
commitc0774e08c5d5a9ff2d810a9387add4d8e28252c6
treef35b5081b03f0f090c13a0fa074ff7cb3b1f60c1
parent69f41116dbb9f28a9ede1182a9cafd8206722b6c
timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond

Commit d3b8452948 (ntp: Fix leap-second hrtimer livelock) broke the
leapsecond update of CLOCK_MONOTONIC. The missing leapsecond update to
wall_to_monotonic causes discontinuities in CLOCK_MONOTONIC.

Adjust wall_to_monotonic when NTP inserted a leapsecond.

Reported-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Tested-by: Richard Cochran <richardcochran@gmail.com>
Cc: stable@kernel.org
Link: http://lkml.kernel.org/r/1338400497-12420-1-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/time/timekeeping.c