From patchwork Tue Jul 17 22:05:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10089 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 342F623F2A for ; Tue, 17 Jul 2012 22:05:49 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id EFAB8A18074 for ; Tue, 17 Jul 2012 22:05:48 +0000 (UTC) Received: by ggnf1 with SMTP id f1so1056673ggn.11 for ; Tue, 17 Jul 2012 15:05:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=sRm+bmVjdfF2G13C6YGgjsYuo4onQiPr445kVctZhVo=; b=D5MfZ002FJ0TOxqPTilPCjdv9vDU9Q2yLsUtHa+AkDYE1uGdUlPxIMAOfjQdkrgmVc C1tVbgo1sQmWukCMABhcOFRTGJbSOAUaEaP+R5uHo/MxgEfGY1py8cr09GYayTz6hIvo FFvJVwMojrZQjhCMkrp3DP60L133kWc6PvfHQ3QNsn6Il3Gu58csujA8/1SAI3nWYETh tPcN2bqizhvNcUP6/q0gwVu9/vhbVQ/fSgBf28Cf3CjX329JjVNayXRwaYu9iu5+A6j0 IoHHRPc/Zs0KDLff5siv7rD0szj7VpwNsSHXVtlfnLmx0GAmhsJbUpnRuJTeuyE2MsRU CMJg== Received: by 10.50.40.193 with SMTP id z1mr284285igk.0.1342562748154; Tue, 17 Jul 2012 15:05:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.241.2 with SMTP id lc2csp25034ibb; Tue, 17 Jul 2012 15:05:47 -0700 (PDT) Received: by 10.50.219.135 with SMTP id po7mr253425igc.15.1342562747279; Tue, 17 Jul 2012 15:05:47 -0700 (PDT) Received: from e8.ny.us.ibm.com (e8.ny.us.ibm.com. [32.97.182.138]) by mx.google.com with ESMTPS id gg8si18231810igb.31.2012.07.17.15.05.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 15:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.138 as permitted sender) client-ip=32.97.182.138; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.138 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 18:05:46 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e8.ny.us.ibm.com (192.168.1.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 18:05:44 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 187CC38C805E; Tue, 17 Jul 2012 18:05:44 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HM5hBH390982; Tue, 17 Jul 2012 18:05:43 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HM5h3A022957; Tue, 17 Jul 2012 19:05:43 -0300 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HM5hMa022948; Tue, 17 Jul 2012 19:05:43 -0300 From: John Stultz To: stable@vger.kernel.org Cc: Richard Cochran , Prarit Bhargava , Thomas Gleixner , Linux Kernel , John Stultz Subject: [PATCH 02/11] 2.6.32.x: ntp: Correct TAI offset during leap second Date: Tue, 17 Jul 2012 18:05:26 -0400 Message-Id: <1342562735-55870-3-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342562735-55870-1-git-send-email-johnstul@us.ibm.com> References: <1342562735-55870-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071722-9360-0000-0000-0000087F7111 X-Gm-Message-State: ALoCoQktX9GCxcPBYbiD2yzhWwHuVQDFwMvLUMMEk6xVsxB3RdBD+w+Qk1wyhs2x+FxMTATAM1uV From: Richard Cochran 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 --- 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;