Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754447Ab3DVRCB (ORCPT ); Mon, 22 Apr 2013 13:02:01 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:47304 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754402Ab3DVRB7 (ORCPT ); Mon, 22 Apr 2013 13:01:59 -0400 Message-ID: <51756D04.6030001@linaro.org> Date: Mon, 22 Apr 2013 10:01:56 -0700 From: John Stultz User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Thomas Gleixner CC: Jiri Slaby , Linux-pm mailing list , LKML Subject: Re: Resume does not work after timekeeping change References: <5172B86C.5030606@suse.cz> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1339 Lines: 42 On 04/21/2013 07:48 AM, Thomas Gleixner wrote: > 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 >> 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; Looks good. Acked-by: John Stultz -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/