Skip to content

Commit

Permalink
ntp: Correct TAI offset during leap second
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Cochran authored and John Stultz committed May 21, 2012
1 parent bdebaf8 commit dd48d70
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/time/ntp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand All @@ -426,7 +427,6 @@ int second_overflow(unsigned long secs)
}
break;
case TIME_OOP:
time_tai++;
time_state = TIME_WAIT;
break;

Expand Down

0 comments on commit dd48d70

Please sign in to comment.