The patch titled
IDE: Touch NMI watchdog during resume from STR
has been removed from the -mm tree. Its filename is
ide-touch-nmi-watchdog-during-resume-from-str.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: IDE: Touch NMI watchdog during resume from STR
From: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxx: modular build fix]
Signed-off-by: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/nmi.c | 1 +
drivers/ide/ide-iops.c | 2 ++
2 files changed, 3 insertions(+)
diff -puN arch/i386/kernel/nmi.c~ide-touch-nmi-watchdog-during-resume-from-str arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/nmi.c~ide-touch-nmi-watchdog-during-resume-from-str
+++ a/arch/i386/kernel/nmi.c
@@ -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);
diff -puN drivers/ide/ide-iops.c~ide-touch-nmi-watchdog-during-resume-from-str drivers/ide/ide-iops.c
--- a/drivers/ide/ide-iops.c~ide-touch-nmi-watchdog-during-resume-from-str
+++ a/drivers/ide/ide-iops.c
@@ -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,
if (stat == 0xff)
return -ENODEV;
touch_softlockup_watchdog();
+ touch_nmi_watchdog();
}
return -EBUSY;
}
_
Patches currently in -mm which might be from xschmi00@xxxxxxxxxxxxxxxxxx are
origin.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
