openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Cochran 2012-04-26 14:11:32 +02:00 committed by John Stultz
parent bdebaf80a0
commit dd48d708ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/time/ntp.c
View File

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