From patchwork Tue Jul 17 21:49:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john stultz X-Patchwork-Id: 10083 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 B279623E3D for ; Tue, 17 Jul 2012 21:49:53 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 82D40A181FE for ; Tue, 17 Jul 2012 21:49:53 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so1041205ghb.11 for ; Tue, 17 Jul 2012 14:49:53 -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=muP7TGrGpNsKoWlALPGLQFg+vXI5J/fmGn7HRi7yucw=; b=EBsf5I+PANMyq0VXIOldItrTITObvEnEscUJD4FUQtottFWs0Cxhr0YK3QV6oaymIn Bd6m+Jz/bT6aBS4GtmogkKSx7DBHEKlQQ8Yz2KdEmM/Mn8MEHZInCcHkfnKN35JOmTRf 6PtkFS76YAZPLF1ZqFFv1oKgVZ7xJaIdotZaegkJ27u6tg7qBcsL71Pvl1Yh2ZZfC+br gPY4NsOJoJHxb6yT8k87kYdMcKe+o+zU/HRvn6hhzm1tYUtY6Z/VH06hjg6pQS+lTR1C /EMMAKe1wvDyFWkbyrtbBkvuwiIJXMxTemQMSMoTtIVentYAT3zVCm2KUXyGpPOmQng5 iyYg== Received: by 10.50.57.167 with SMTP id j7mr161507igq.53.1342561793121; Tue, 17 Jul 2012 14:49:53 -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 lc2csp24875ibb; Tue, 17 Jul 2012 14:49:52 -0700 (PDT) Received: by 10.50.188.201 with SMTP id gc9mr180515igc.44.1342561791857; Tue, 17 Jul 2012 14:49:51 -0700 (PDT) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id bd9si26571506icc.27.2012.07.17.14.49.51 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 14:49:51 -0700 (PDT) Received-SPF: pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.154 as permitted sender) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=pass (google.com: domain of johnstul@us.ibm.com designates 32.97.110.154 as permitted sender) smtp.mail=johnstul@us.ibm.com Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 15:49:51 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 15:49:48 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 985923E40055 for ; Tue, 17 Jul 2012 21:49:47 +0000 (WET) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6HLnlp5259154 for ; Tue, 17 Jul 2012 15:49:47 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6HLnkJu026974 for ; Tue, 17 Jul 2012 15:49:46 -0600 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6HLnZI9026401; Tue, 17 Jul 2012 15:49:45 -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.34.x: timekeeping: Add missing update call in timekeeping_resume() Date: Tue, 17 Jul 2012 17:49:31 -0400 Message-Id: <1342561771-55678-12-git-send-email-johnstul@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342561771-55678-1-git-send-email-johnstul@us.ibm.com> References: <1342561771-55678-1-git-send-email-johnstul@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071721-7606-0000-0000-0000021489BD X-Gm-Message-State: ALoCoQlSr7eWYbc0vYu+62+gg6DUx1Fxih/zhfVjSyZXdHL92DcYVNPtLAa36FJpPX2EPgIqELsk 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 0b4f6d1..156fd67 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -626,6 +626,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();