On Sat, 20 Apr 2013, Jiri Slaby wrote: > Hi, > > my machine does not wake from suspend to RAM on my box running the -next > kernel. The last thing I see is "Disabling non-boot CPUs ...". I > bisected it to this commit: > > commit 7ec98e15aa049b7a2ca73485f31cf4f90c34e2dd > Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Date: Thu Feb 21 22:51:39 2013 +0000 > > timekeeping: Delay update of clock->cycle_last > > > Reverting that one on the top of -next-20130419 makes it work again. Does the patch below fix the issue? Thanks, tglx --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 675f720..98cd470 100644 --- a/kernel/time/timekeeping.c +++ b/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);
