From 6979896acfea554cfffb8980cfc7e3fa9bc28931 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 22 Apr 2013 09:37:04 +0200
Subject: [PATCH] --- yaml --- r: 366207 b: refs/heads/master c:
 77c675ba18836802f6b73d2d773481d06ebc0f04 h: refs/heads/master i:   366205:
 ffd53133add19cdde95354013eedac3359630b3f   366203:
 e61dd7dc30a1629743af4c52377dd472252fe90c   366199:
 4ab25dbeb09b977119ad872072cb35915d0ce032   366191:
 2e0c2b29c6137ee58ea1a032b8fc4134cb2f1a56   366175:
 f8735b96d1cb85ba195107d28fd7e74a6cd74710   366143:
 3b986dd0adab48195158050bde6ab15015ce9bbd   366079:
 a50738940c5cda0d675f91f7083672c7bed4af8f v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/time/timekeeping.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 31f764103bda..0cfddcbe764b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2054b2c11682495fca41e9d4092e654df63b517
+refs/heads/master: 77c675ba18836802f6b73d2d773481d06ebc0f04
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index 675f720a848b..98cd470bbe49 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/kernel/time/timekeeping.c
@@ -951,7 +951,7 @@ static void timekeeping_resume(void)
 		__timekeeping_inject_sleeptime(tk, &ts_delta);
 
 	/* Re-base the last cycle value */
-	clock->cycle_last = cycle_now;
+	tk->cycle_last = clock->cycle_last = cycle_now;
 	tk->ntp_error = 0;
 	timekeeping_suspended = 0;
 	timekeeping_update(tk, false, true);