From: Thomas Gleixner Date: Tue, 17 Jul 2012 17:33:58 +0000 (-0400) Subject: timekeeping: Add missing update call in timekeeping_resume() X-Git-Tag: v2.6.39-400.9.0~316 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=470e00b236d5e4d265f02ebaa021384de46f72b4;p=users%2Fjedix%2Flinux-maple.git timekeeping: Add missing update call in timekeeping_resume() 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: John Stultz Cc: Ingo Molnar Cc: Peter Zijlstra , Cc: Prarit Bhargava Signed-off-by: Thomas Gleixner Signed-off-by: John Stultz Signed-off-by: Linus Torvalds Cc: Prarit Bhargava Cc: Thomas Gleixner Signed-off-by: John Stultz Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 0851978b661f25192ff763289698f3175b1bab42) Signed-off-by: Joe Jin --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 6e2fe34c8b78..1e207ebfdfa0 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -702,6 +702,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();