aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-05-30 10:54:57 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-17 11:21:23 -0700
commitd913c02b0a172d5dca6280da5b17a407d69bbce4 (patch)
treed1efd41f5bb0214b30f04f29c6b4672c6017d40b /fs
parent3410afedcda2f504e8fbe02a7f4c49912ce688c8 (diff)
timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
commit fad0c66c4bb836d57a5f125ecd38bed653ca863a upstream. Commit 6b43ae8a61 (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> Link: http://lkml.kernel.org/r/1338400497-12420-1-git-send-email-john.stultz@linaro.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions