summaryrefslogtreecommitdiffstats
path: root/kernel/time/timekeeping.c
diff options
context:
space:
mode:
authorJohn Stultz <johnstul@us.ibm.com>2012-07-13 07:21:50 +0200
committerThomas Gleixner <tglx@linutronix.de>2012-07-15 09:48:49 +0200
commit6b1859dba01c7d512b72d77e3fd7da8354235189 (patch)
tree67eb3bede64476652d1fbd46356e7192fd43b030 /kernel/time/timekeeping.c
parentLinux 3.5-rc7 (diff)
downloadlinux-6b1859dba01c7d512b72d77e3fd7da8354235189.tar.xz
linux-6b1859dba01c7d512b72d77e3fd7da8354235189.zip
ntp: Fix STA_INS/DEL clearing bug
In commit 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d, I introduced a bug that kept the STA_INS or STA_DEL bit from being cleared from time_status via adjtimex() without forcing STA_PLL first. Usually once the STA_INS is set, it isn't cleared until the leap second is applied, so its unlikely this affected anyone. However during testing I noticed it took some effort to cancel a leap second once STA_INS was set. Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Prarit Bhargava <prarit@redhat.com> CC: stable@vger.kernel.org # 3.4 Link: http://lkml.kernel.org/r/1342156917-25092-2-git-send-email-john.stultz@linaro.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/timekeeping.c')
0 files changed, 0 insertions, 0 deletions