---

yaml --- r: 366207 b: refs/heads/master c: 77c675b h: refs/heads/master i: 366205: ffd5313 366203: e61dd7d 366199: 4ab25db 366191: 2e0c2b2 366175: f8735b9 366143: 3b986dd 366079: a507389 v: v3
git-mirror · Apr 22, 2013 · 6979896 · 6979896
1 parent ce86472
commit 6979896
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);