From patchwork Mon Jul 23 17:24:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [02/11] 2.6.32.x: ntp: Correct TAI offset during leap second Date: Mon, 23 Jul 2012 07:24:30 -0000 From: Luis Henriques X-Patchwork-Id: 172716 Message-Id: <1343064279-28091-3-git-send-email-luis.henriques@canonical.com> To: kernel-team@lists.ubuntu.com From: Richard Cochran BugLink: http://bugs.launchpad.net/bugs/1020285 This is a backport of dd48d708ff3e917f6d6b6c2b696c3f18c019feed 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 Cc: Prarit Bhargava Cc: Thomas Gleixner Cc: Linux Kernel Signed-off-by: John Stultz Signed-off-by: Luis Henriques --- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index dc76c9a..c1c36a2 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -208,6 +208,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"); } @@ -222,7 +223,6 @@ int second_overflow(unsigned long secs) } break; case TIME_OOP: - time_tai++; time_state = TIME_WAIT; break;