Commit dd48d708 authored Apr 26, 2012 by Richard Cochran Committed by John Stultz May 21, 2012

ntp: Correct TAI offset during leap second

When repeating a UTC time value during a leap second (when the UTC
time should be 23:59:60), the TAI timescale should not stop. The kernel
NTP code increments the TAI offset one second too late. This patch fixes
the issue by incrementing the offset during the leap second itself.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

parent bdebaf80

kernel/time/ntp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -412,6 +412,7 @@ int second_overflow(unsigned long secs)
		if (secs % 86400 == 0) {
		leap = -1;
		time_state = TIME_OOP;
		time_tai++;
		printk(KERN_NOTICE
		"Clock: inserting leap second 23:59:60 UTC\n");
		}
		@@ -426,7 +427,6 @@ int second_overflow(unsigned long secs)
		}
		break;
		case TIME_OOP:
		time_tai++;
		time_state = TIME_WAIT;
		break;

Admin message