From patchwork Tue Jul 17 17:33:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10060 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 4862523E3D for ; Tue, 17 Jul 2012 17:41:07 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id EF23EA186D6 for ; Tue, 17 Jul 2012 17:41:06 +0000 (UTC) Received: by yhpp61 with SMTP id p61so721623yhp.11 for ; Tue, 17 Jul 2012 10:41:06 -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=cEDyYIF0cGBF3iL+tK1D9A9ZseX1B0nFCE7+VlGdBrk=; b=NcEAI8sHgB4x6Bkq4RAVVK7XRuezllURSjCo8XGcowZ1npHWBhkdGFXv40Ducj5vdd N6LM2ORGI2FZagV7VobiJg+klg3NFmJc7vF+Mj9aL9TwI297c/7oeRPQJLswsAZrRXPE jEfDzzAUYEAuv0yLHId5+JyFkMYWqyjZ5fD3vjT09NSfziUaQo9KAtwTvnJnXnMvCBW3 boGYzvVLZj/lCZ4B2/rX1RK3mfMKFVxTYzKvFeTmHD+dAwyYliliPgZLl4tiqhujNkD1 7L7isHcOoJqdFTyospASXXomrigF15c1MqwZOCIx3iqK70f8Z48Nwfsm+Oq1yFVvvzVq Q0SA== Received: by 10.50.57.167 with SMTP id j7mr2123845igq.53.1342546866145; Tue, 17 Jul 2012 10:41:06 -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 lc2csp22616ibb; Tue, 17 Jul 2012 10:41:05 -0700 (PDT) Received: by 10.50.87.228 with SMTP id bb4mr2220852igb.27.1342546865762; Tue, 17 Jul 2012 10:41:05 -0700 (PDT) Received: from e4.ny.us.ibm.com (e4.ny.us.ibm.com. [32.97.182.144]) by mx.google.com with ESMTPS id hi2si17519552igc.67.2012.07.17.10.41.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 10:41:05 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.144 as permitted sender) client-ip=32.97.182.144; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.144 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 13:41:04 -0400 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e4.ny.us.ibm.com (192.168.1.104) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 13:35:09 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 555EEC900BB for ; Tue, 17 Jul 2012 13:34:51 -0400 (EDT) Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HHYnou399336 for ; Tue, 17 Jul 2012 13:34:50 -0400 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HHZPwh016914 for ; Tue, 17 Jul 2012 11:35:26 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HHZEEC015928; Tue, 17 Jul 2012 11:35:25 -0600 From: John Stultz To: stable@vger.kernel.org Cc: Thomas Gleixner , LKML , Linux PM list , John Stultz , Ingo Molnar , Peter Zijlstra , Prarit Bhargava , Linus Torvalds Subject: [PATCH 11/11] 3.0.x: timekeeping: Add missing update call in timekeeping_resume() Date: Tue, 17 Jul 2012 13:33:58 -0400 Message-Id: <1342546438-17534-12-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342546438-17534-1-git-send-email-johnstul@us.ibm.com> References: <1342546438-17534-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071717-3534-0000-0000-00000A85AC27 X-Gm-Message-State: ALoCoQnKN+Si+dxARegZ959TjXBtBmbsvIqjs8uSzvx/It7Nrxw0gcmXSKfbNT0S5JEX+LWGJrc4 From: Thomas Gleixner This is a backport of 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0 The leap second rework unearthed another issue of inconsistent data. On timekeeping_resume() the timekeeper data is updated, but nothing calls timekeeping_update(), so now the update code in the timer interrupt sees stale values. This has been the case before those changes, but then the timer interrupt was using stale data as well so this went unnoticed for quite some time. Add the missing update call, so all the data is consistent everywhere. Reported-by: Andreas Schwab Reported-and-tested-by: "Rafael J. Wysocki" Reported-and-tested-by: Martin Steigerwald Cc: LKML Cc: Linux PM list Cc: John Stultz Cc: Ingo Molnar Cc: Peter Zijlstra , Cc: Prarit Bhargava Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner Signed-off-by: John Stultz Signed-off-by: Linus Torvalds Cc: Prarit Bhargava Cc: Thomas Gleixner Cc: Linux Kernel Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index f0c7565..678ae31 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -693,6 +693,7 @@ static void timekeeping_resume(void) timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock); timekeeper.ntp_error = 0; timekeeping_suspended = 0; + timekeeping_update(false); write_sequnlock_irqrestore(&xtime_lock, flags); touch_softlockup_watchdog();