Am Montag, 16. Juli 2012 schrieb Linus Torvalds: > On Mon, Jul 16, 2012 at 9:28 AM, Martin Steigerwald <mar...@lichtvoll.de> wrote: > > Regresses badly on resume from in-kernel hibernation. I.e. hangs with > > some red graphics artifacts on the tty. The same artifacts appear > > for a short time with rc6 + some commits as well, but there then > > X.org is available again. > > There's a one-liner fix for this bouncing around. > > Appended is a white-space damaged cut-and-paste version of the fix, so > you'll need to either find the original patch (search the kernel > mailing list for "Excessive delay or hang during resume from system > suspend due to a hrtimer commit"), or just edit in the one-liner by > hand. > > This should fix it (there's apparently a question on whether the > "false" should be "true", but that's an independent detail, it's worth > verifying in this form regardless). > > Linus > --- > diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c > index 269b1fe..3447cfa 100644 > --- a/kernel/time/timekeeping.c > +++ b/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();
That fixes it. Tested three cycles. Tested-By: Martin Steigerwald <mar...@lichtvoll.de> Compiling TuxOnIce 3.5-rc7 with that patch now to verify if that fix work there, too. TuxOnIce is still so much faster than in-kernel-suspend ;). I still get: Message from syslogd@merkaba at Jul 16 18:53:53 ... kernel:[ 42.442466] Uhhuh. NMI received for unknown reason 3c on CPU 0. Message from syslogd@merkaba at Jul 16 18:53:53 ... kernel:[ 42.442470] Do you have a strange power saving mode enabled? Message from syslogd@merkaba at Jul 16 18:53:53 ... kernel:[ 42.442472] Dazed and confused, but trying to continue but I keep getting these since quite some time and did not take the time to follow up on it. Thanks, -- Martin 'Helios' Steigerwald - http://www.Lichtvoll.de GPG: 03B0 0D6C 0040 0710 4AFA B82F 991B EAAC A599 84C7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
