Messages in this thread Patch in this message | | | Subject | Re: [3/6] 2.6.21-rc4: known regressions | From | Thomas Gleixner <> | Date | Mon, 26 Mar 2007 18:26:47 +0200 |
| |
On Mon, 2007-03-26 at 13:37 +0800, Jeff Chua wrote: > On 3/26/07, Adrian Bunk <bunk@stusta.de> wrote: > > > > Resume from RAM (s2ram) still broke (tried with or without > > > CONFIG_NO_HZ). Suspend to RAM seems ok, but upon resume, the screen > > > will only display "inu" and only after pressing the power button will > > > the system return to console. But "date" still doesn't advance. > > > > This might be related to the following regression: > > > > Subject : first disk access after resume takes several minutes > > ('date' does not advance after resume from RAM, CONFIG_NO_HZ=n) > > References : http://lkml.org/lkml/2007/3/8/117 > > http://lkml.org/lkml/2007/3/25/20 > > Submitter : Michael S. Tsirkin <mst@mellanox.co.il> > > Handled-By : Thomas Gleixner <tglx@linutronix.de> > > Ingo Molnar <mingo@elte.hu> > > Status : problem is being debugged > > Adrian, > > It's related. I tested without CONFIG_HPET_TIMER, and now my X60 can > suspend and resume from RAM (s2ram). Even better, it works > with/without CONFIG_NO_HZ.
Does the patch below fix the HPET_TIMER=y case ?
tglx
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index f3ab61e..76afea6 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c @@ -197,7 +197,7 @@ static int hpet_next_event(unsigned long delta, cnt += delta; hpet_writel(cnt, HPET_T0_CMP); - return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0); + return ((long)(hpet_readl(HPET_COUNTER) - cnt ) > 0) ? -ETIME : 0; } /*
- 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/
| |