From: John Stultz <johnstul@us.ibm.com>
To: stable@vger.kernel.org
Cc: Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Linux Kernel <linux-kernel@vger.kernel.org>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 02/11] 2.6.32.x: ntp: Correct TAI offset during leap second
Date: Tue, 17 Jul 2012 18:05:26 -0400 [thread overview]
Message-ID: <1342562735-55870-3-git-send-email-johnstul@us.ibm.com> (raw)
In-Reply-To: <1342562735-55870-1-git-send-email-johnstul@us.ibm.com>
From: Richard Cochran <richardcochran@gmail.com>
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>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
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;
--
1.7.9.5
next prev parent reply other threads:[~2012-07-17 22:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 22:05 [PATCH 00/11] 2.6.32-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-17 22:05 ` [PATCH 01/11] 2.6.32.x: ntp: Fix leap-second hrtimer livelock John Stultz
2012-07-17 22:05 ` John Stultz [this message]
2012-07-17 22:05 ` [PATCH 03/11] 2.6.32.x: timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond John Stultz
2012-07-17 22:05 ` [PATCH 04/11] 2.6.32.x: time: Move common updates to a function John Stultz
2012-07-17 22:05 ` [PATCH 05/11] 2.6.32.x: hrtimer: Provide clock_was_set_delayed() John Stultz
2012-07-17 22:05 ` [PATCH 06/11] 2.6.32.x: timekeeping: Fix leapsecond triggered load spike issue John Stultz
2012-07-17 22:05 ` [PATCH 07/11] 2.6.32.x: timekeeping: Maintain ktime_t based offsets for hrtimers John Stultz
2012-07-17 22:05 ` [PATCH 08/11] 2.6.32.x: hrtimers: Move lock held region in hrtimer_interrupt() John Stultz
2012-07-17 22:05 ` [PATCH 09/11] 2.6.32.x: timekeeping: Provide hrtimer update function John Stultz
2012-07-17 22:05 ` [PATCH 10/11] 2.6.32.x: hrtimer: Update hrtimer base offsets each hrtimer_interrupt John Stultz
2012-07-17 22:05 ` [PATCH 11/11] 2.6.32.x: timekeeping: Add missing update call in timekeeping_resume() John Stultz
2012-07-18 0:34 ` [PATCH 00/11] 2.6.32-stable: Fix for leapsecond deadlock & hrtimer/futex issue John Stultz
2012-07-19 9:53 ` Willy Tarreau
2012-07-19 12:56 ` Willy Tarreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342562735-55870-3-git-send-email-johnstul@us.ibm.com \
--to=johnstul@us.ibm.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).