time/ntp fix

GIT PULL Ingo Molnar 1 participant 1 message Jul 18, 2012 Timekeeping, clocksource core, NTP, alarmtimer

lore

Share & tools

lore

Ingo Molnar

author

2012-07-18 08:45 UTC #0 lore raw

Linus,

Please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

HEAD: 6b1859dba01c7d512b72d77e3fd7da8354235189 ntp: Fix STA_INS/DEL clearing bug

Thanks,

Ingo

------------------>
John Stultz (1):
ntp: Fix STA_INS/DEL clearing bug

 kernel/time/ntp.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

kernel/time/ntp.c +6 -2

index 70b33ab..b7fbadc 100644
@@ -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;