Re: Linux 3.5-rc7

[Linus Torvalds]

On Mon, Jul 16, 2012 at 9:28 AM, Martin Steigerwald <Martin@xxxxxxxxxxxx> 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();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/