Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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@ionos


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d2054b2c

kernel/time/timekeeping.c

+1 −1
Original line number Diff line number Diff line
@@ -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);