From patchwork Tue Jul 17 22:05:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10094 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 3899B23F2A for ; Tue, 17 Jul 2012 22:06:03 +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 072B0A18360 for ; Tue, 17 Jul 2012 22:06:02 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so1056673ggn.11 for ; Tue, 17 Jul 2012 15:06:02 -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=VwBDOwzXk9pkwIlCdSMNcmI8n+O3mn3iTzQt9MlU5Zc=; b=i2xWHYjBd0eYhKrjwvZkBim8dBScCIP+25voYQzIOFPq1BgfCHDJw4QKHpOlnrHLwf mjTKF/+v5uc8e9MW+wK9jZ1jWnnuMOw0Z2FEzmWKfJIXWM7A7sYL3lJHHU9fmksJ9ecY flSQJRdY0y21QzgG2cxy5WjXGoW1SP50F4GPU3IxqrVcI10VXdBYmhJQzRIijE2OVZCP NpqeVEVpucF5dlXmdXmvq3Qv7vp3vwUQAfhQHtp3sF0tXsdHuvA2e8rmE19bDI6EH6Nc 7R7UiqKxZAOrj78oxAyFXnWXN0LpkhgR+Tme4HFpVvA69xVNFhTL7F4IpEZWtzfCyYYz +nJw== Received: by 10.50.160.198 with SMTP id xm6mr275922igb.0.1342562762349; Tue, 17 Jul 2012 15:06:02 -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 lc2csp25046ibb; Tue, 17 Jul 2012 15:06:01 -0700 (PDT) Received: by 10.182.39.39 with SMTP id m7mr5839200obk.20.1342562761405; Tue, 17 Jul 2012 15:06:01 -0700 (PDT) Received: from e7.ny.us.ibm.com (e7.ny.us.ibm.com. [32.97.182.137]) by mx.google.com with ESMTPS id zm6si19540279obb.166.2012.07.17.15.06.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 15:06:01 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.137 as permitted sender) client-ip=32.97.182.137; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.182.137 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 18:05:59 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 18:05:46 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id C35C238C805C for ; Tue, 17 Jul 2012 18:05:45 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HM5ijw411568 for ; Tue, 17 Jul 2012 18:05:44 -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 q6HM5hVJ023014 for ; Tue, 17 Jul 2012 19:05:44 -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 q6HM5hMj022948; Tue, 17 Jul 2012 19:05:43 -0300 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.32.x: timekeeping: Add missing update call in timekeeping_resume() Date: Tue, 17 Jul 2012 18:05:35 -0400 Message-Id: <1342562735-55870-12-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-5806-0000-0000-000017662225 X-Gm-Message-State: ALoCoQmrjQAhkJovmHOKd9a8unBXOe2fa+oDaMVf+bjAgQEmC4iI8wOa94kEr4gOtNxXQe4GGFka 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 6054b94..3f7e53f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -637,6 +637,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();