Attachment 603555 Details for Bug 836803 – RHEL PATCH 7/7

[patch] RHEL PATCH 7/7

0007-timekeeping-Add-missing-update-call-in-timekeeping_r.patch (text/plain), 2.08 KB, created by Prarit Bhargava on 2012-08-10 13:57:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2012-08-10 13:57:13 UTC

Size: 2.08 KB

patch

obsolete

>From 5786e73ae63fbba35431628fa026c3a3a5a5fcd8 Mon Sep 17 00:00:00 2001
>From: Prarit Bhargava <prarit@redhat.com>
>Date: Tue, 24 Jul 2012 10:27:27 -0400
>Subject: timekeeping: Add missing update call in timekeeping_resume()
>
>commit 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0
>Author: Thomas Gleixner <tglx@linutronix.de>
>Date:   Mon Jul 16 12:50:42 2012 -0400
>
>    timekeeping: Add missing update call in timekeeping_resume()
>
>    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 <schwab@linux-m68k.org>
>    Reported-and-tested-by: "Rafael J. Wysocki" <rjw@sisk.pl>
>    Reported-and-tested-by: Martin Steigerwald <Martin@lichtvoll.de>
>    Cc: LKML <linux-kernel@vger.kernel.org>
>    Cc: Linux PM list <linux-pm@vger.kernel.org>
>    Cc: John Stultz <johnstul@us.ibm.com>
>    Cc: Ingo Molnar <mingo@kernel.org>
>    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
>    Cc: Prarit Bhargava <prarit@redhat.com>
>    Cc: stable@vger.kernel.org
>    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>    Signed-off-by: John Stultz <johnstul@us.ibm.com>
>    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>---
> kernel/time/timekeeping.c |    1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
>index 47fde33..9d2d0f0 100644
>--- a/kernel/time/timekeeping.c
>+++ b/kernel/time/timekeeping.c
>@@ -675,6 +675,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(&timekeeper.lock, flags);
> 
> 	touch_softlockup_watchdog();
>-- 
>1.7.9.3
>

Actions: View | Diff

Attachments on bug 836803: 597663 | 603549 | 603550 | 603551 | 603552 | 603553 | 603554 | 603555