Commit 6b1859db authored Jul 13, 2012 by John Stultz Committed by Thomas Gleixner Jul 15, 2012

ntp: Fix STA_INS/DEL clearing bug



In commit 6b43ae8a, 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>

parent 84a1caf1

kernel/time/ntp.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -409,7 +409,9 @@ int second_overflow(unsigned long secs)
		time_state = TIME_DEL;
		break;
		case TIME_INS:
		if (secs % 86400 == 0) {
		if (!(time_status & STA_INS))
		time_state = TIME_OK;
		else if (secs % 86400 == 0) {
		leap = -1;
		time_state = TIME_OOP;
		time_tai++;
		@@ -418,7 +420,9 @@ int second_overflow(unsigned long secs)
		}
		break;
		case TIME_DEL:
		if ((secs + 1) % 86400 == 0) {
		if (!(time_status & STA_DEL))
		time_state = TIME_OK;
		else if ((secs + 1) % 86400 == 0) {
		leap = 1;
		time_tai--;
		time_state = TIME_WAIT;

Admin message