From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Thu, 4 Oct 2012 22:46:56 +0000 (-0700)
Subject: Revert "timekeeping: Add missing update call in timekeeping_resume()"
X-Git-Tag: v2.6.39-400.9.0~303^2~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=25ff03999bb486a53ec4eff5ff7e8a7f64e39800;p=users%2Fjedix%2Flinux-maple.git

Revert "timekeeping: Add missing update call in timekeeping_resume()"

This reverts commit 470e00b236d5e4d265f02ebaa021384de46f72b4.

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 1e207ebfdfa0..6e2fe34c8b78 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -702,7 +702,6 @@ 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();