---

yaml --- r: 311972 b: refs/heads/master c: 3e99713 h: refs/heads/master v: v3
git-mirror · Jul 16, 2012 · f3e3745 · f3e3745
1 parent 03f5d58
commit f3e3745
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d519feaccb8a1208f736d00f53a2a73d98ffaa
+refs/heads/master: 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -717,6 +717,7 @@ 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(&timekeeper.lock, flags);
 
 	touch_softlockup_watchdog();