Messages in this thread | | | Date | Fri, 14 Jul 2006 19:06:05 +0000 | From | Pavel Machek <> | Subject | Re: [patch] IDE: Touch NMI watchdog during resume from STR |
| |
Hi!
> When resuming from suspend-to-RAM, the NMI watchdog > detects a lockup in ide_wait_not_busy. > Here's a screenshot of the trace taken by a digital > camera: > http://www.uamt.feec.vutbr.cz/rizeni/pom/DSC03510-2.JPG > > Let's touch the NMI watchdog in ide_wait_not_busy. The > system then resumes correctly from STR. > > Signed-off-by: Michal Schmidt > <xschmi00@stud.feec.vutbr.cz>
ACK.
> diff --git a/drivers/ide/ide-iops.c > b/drivers/ide/ide-iops.c > index 6571652..77703ac 100644 > --- a/drivers/ide/ide-iops.c > +++ b/drivers/ide/ide-iops.c > @@ -23,6 +23,7 @@ #include <linux/delay.h> > #include <linux/hdreg.h> > #include <linux/ide.h> > #include <linux/bitops.h> > +#include <linux/nmi.h> > > #include <asm/byteorder.h> > #include <asm/irq.h> > @@ -1243,6 +1244,7 @@ int ide_wait_not_busy(ide_hwif_t > *hwif, if (stat == 0xff) > return -ENODEV; > touch_softlockup_watchdog(); > + touch_nmi_watchdog();
Perhaps we need touch_all_watchdogs()?
Pavel
-- Thanks for all the (sleeping) penguins. - 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/
| |