diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2012-07-17 13:33:49 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 08:58:22 -0700 |
| commit | 96bab736bad82423c2b312d602689a9078481fa9 (patch) | |
| tree | 6d330ba20fff89b28d43ef996d5b9592520f8ae2 /kernel/time | |
| parent | 9c24771f844b6f0708a72cd116953e0a128e5d2a (diff) | |
| download | kernel_samsung_smdk4412-96bab736bad82423c2b312d602689a9078481fa9.zip kernel_samsung_smdk4412-96bab736bad82423c2b312d602689a9078481fa9.tar.gz kernel_samsung_smdk4412-96bab736bad82423c2b312d602689a9078481fa9.tar.bz2 | |
ntp: Correct TAI offset during leap second
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 <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/ntp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 4508f7f..f1eb182 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -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; |