Commit 77c675ba authored by Thomas Gleixner's avatar Thomas Gleixner

timekeeping: Update tk->cycle_last in resume

commit 7ec98e15 (timekeeping: Delay update of clock->cycle_last)
forgot to update tk->cycle_last in the resume path. This results in a
stale value versus clock->cycle_last and prevents resume in the worst
case.
Reported-by: default avatarJiri Slaby <jslaby@suse.cz>
Reported-and-tested-by: default avatarBorislav Petkov <bp@alien8.de>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Linux-pm mailing list <linux-pm@lists.linux-foundation.org>
Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1304211648150.21884@ionosSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d2054b2c
...@@ -951,7 +951,7 @@ static void timekeeping_resume(void) ...@@ -951,7 +951,7 @@ static void timekeeping_resume(void)
__timekeeping_inject_sleeptime(tk, &ts_delta); __timekeeping_inject_sleeptime(tk, &ts_delta);
/* Re-base the last cycle value */ /* Re-base the last cycle value */
clock->cycle_last = cycle_now; tk->cycle_last = clock->cycle_last = cycle_now;
tk->ntp_error = 0; tk->ntp_error = 0;
timekeeping_suspended = 0; timekeeping_suspended = 0;
timekeeping_update(tk, false, true); timekeeping_update(tk, false, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment