Commit 76117661 authored by Richard Cochran's avatar Richard Cochran Committed by Ben Hutchings

ntp: Correct TAI offset during leap second

commit dd48d708 upstream.

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: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent a57ccabe
......@@ -378,6 +378,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");
}
......@@ -392,7 +393,6 @@ int second_overflow(unsigned long secs)
}
break;
case TIME_OOP:
time_tai++;
time_state = TIME_WAIT;
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment