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

[Luis Henriques]

From: Thomas Gleixner <tglx at linutronix.de>

BugLink: http://bugs.launchpad.net/bugs/1020285

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 <schwab at linux-m68k.org>
Reported-and-tested-by: "Rafael J. Wysocki" <rjw at sisk.pl>
Reported-and-tested-by: Martin Steigerwald <Martin at lichtvoll.de>
Cc: LKML <linux-kernel at vger.kernel.org>
Cc: Linux PM list <linux-pm at vger.kernel.org>
Cc: John Stultz <johnstul at us.ibm.com>
Cc: Ingo Molnar <mingo at kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>,
Cc: Prarit Bhargava <prarit at redhat.com>
Cc: stable at vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: John Stultz <johnstul at us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Prarit Bhargava <prarit at redhat.com>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Linux Kernel <linux-kernel at vger.kernel.org>
Signed-off-by: John Stultz <johnstul at us.ibm.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 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();
-- 
1.7.9.5