From patchwork Tue Jul 17 18:05:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10071 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 6E4C023E2F for ; Tue, 17 Jul 2012 18:12:19 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 28AC9A186A5 for ; Tue, 17 Jul 2012 18:12:19 +0000 (UTC) Received: by yenq6 with SMTP id q6so767360yen.11 for ; Tue, 17 Jul 2012 11:12:18 -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=zKzPljCC/LQiZ9TUAry4AmoiM06sONkeSDTm7EMg5vI=; b=T7TMBwYhlJ6Q812HExrMp9l9J0GXMigJR3g+YKPKqdxi0PZuo19wh3t2bLNVXZFmkL kyby+crNRKAx6OV3AJzn+NEW5evPmJflu/GHf00+rb2fDeb49kzLstnG50b0k8kPlITW FOHbsISipPUpN57pVmL2DBA88k6tqGZDHdcY8rDSe+WgfKpxQmLrx1sCZimkN3k4o4j2 eaa+ePFRxSUCVlQYikoKFWhoWSfOvDUHnfdbuLJnXf+GvRd9fDrQfGnqvChWRLz+xDF6 4GEU7c2x+xmPTFz3rAcWcCxxqdMMZ/1bMiLpbyrmdUJ3Y+Wg5oBJ9al1rIqWJSlkkwGU 73Xg== Received: by 10.43.63.140 with SMTP id xe12mr2071237icb.57.1342548738479; Tue, 17 Jul 2012 11:12:18 -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 lc2csp23010ibb; Tue, 17 Jul 2012 11:12:18 -0700 (PDT) Received: by 10.50.208.8 with SMTP id ma8mr2260584igc.41.1342548738138; Tue, 17 Jul 2012 11:12:18 -0700 (PDT) Received: from e6.ny.us.ibm.com (e6.ny.us.ibm.com. [32.97.182.146]) by mx.google.com with ESMTPS id q9si17636469igl.9.2012.07.17.11.12.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 11:12:18 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.146 as permitted sender) client-ip=32.97.182.146; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.146 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 14:12:15 -0400 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 14:07:50 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 1FB4EC90076 for ; Tue, 17 Jul 2012 14:07:39 -0400 (EDT) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HI7c4I352050 for ; Tue, 17 Jul 2012 14:07:38 -0400 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HI6Gkk019876 for ; Tue, 17 Jul 2012 12:06:17 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HI60xp018372; Tue, 17 Jul 2012 12:06:11 -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] 2.6.35.x: timekeeping: Add missing update call in timekeeping_resume() Date: Tue, 17 Jul 2012 14:05:42 -0400 Message-Id: <1342548342-19683-12-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342548342-19683-1-git-send-email-johnstul@us.ibm.com> References: <1342548342-19683-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071718-1976-0000-0000-00000F4436C7 X-Gm-Message-State: ALoCoQk2R67FsGdaNnyc73gEkXXyRF8PB+7G38fJ9u4J/CdkqveMPaGUUzzFnzj8289yEjII/tpt 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 2461fe4..782f13d 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -616,6 +616,7 @@ static int timekeeping_resume(struct sys_device *dev) 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();