summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2012-04-26 14:11:32 +0200
committerJohn Stultz <john.stultz@linaro.org>2012-05-21 16:16:54 -0700
commitdd48d708ff3e917f6d6b6c2b696c3f18c019feed (patch)
tree97c00e1e8967a3718636ebf05668f61316002da2 /kernel/time
parentbdebaf80a02b854381fe212e0dac13c8c8edac57 (diff)
downloadlinux-stable-dd48d708ff3e917f6d6b6c2b696c3f18c019feed.tar.gz
linux-stable-dd48d708ff3e917f6d6b6c2b696c3f18c019feed.tar.bz2
linux-stable-dd48d708ff3e917f6d6b6c2b696c3f18c019feed.zip
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>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/ntp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index f03fd83b170b..e8c867173ae5 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -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;