Commit 1e86240f authored Jul 30, 2006 by Michal Schmidt Committed by Linus Torvalds Jul 31, 2006

[PATCH] IDE: Touch NMI watchdog during resume from STR

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.

[akpm@osdl.org: modular build fix]
Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 0e1dfc66

arch/i386/kernel/nmi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,7 @@ void touch_nmi_watchdog (void)
		*/
		touch_softlockup_watchdog();
		}
		EXPORT_SYMBOL(touch_nmi_watchdog);

		extern void die_nmi(struct pt_regs , const char msg);

drivers/ide/ide-iops.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#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, unsigned long timeout)
		if (stat == 0xff)
		return -ENODEV;
		touch_softlockup_watchdog();
		touch_nmi_watchdog();
		}
		return -EBUSY;
		}

Admin message