[11/11] 2.6.34.x: timekeeping: Add missing update call in timekeeping_resume()

Commit Message

John Stultz July 17, 2012, 9:49 p.m. UTC

From: Thomas Gleixner <[e-mail]>

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 <[e-mail]>
Reported-and-tested-by: "Rafael J. Wysocki" <[e-mail]>
Reported-and-tested-by: Martin Steigerwald <[e-mail]>
Cc: LKML <[e-mail]>
Cc: Linux PM list <[e-mail]>
Cc: John Stultz <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>,
Cc: Prarit Bhargava <[e-mail]>
Cc: [e-mail]
Signed-off-by: Thomas Gleixner <[e-mail]>
Signed-off-by: John Stultz <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>
Cc: Prarit Bhargava <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Linux Kernel <[e-mail]>
Signed-off-by: John Stultz <[e-mail]>
---
 kernel/time/timekeeping.c |    1 +
 1 file changed, 1 insertion(+)

Patch

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();