From 3392abc2b7e377ac976d6797bf199ff00b3fbd30 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Date: Sun, 30 Jul 2006 03:03:29 -0700
Subject: [PATCH] --- yaml --- r: 32931 b: refs/heads/master c:
 1e86240f3fd33f8052141778ad3dffe2c96184d7 h: refs/heads/master i:   32929:
 00437edf4ea819a744af2cfb7e35d23ecec3bd61   32927:
 ef213cafcaae17addbf87d2a195659c26d7ecc2a v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/kernel/nmi.c | 1 +
 trunk/drivers/ide/ide-iops.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06537270e977..6b5d922ec9b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e1dfc66b6ec94984a4778132147a8aa36461d58
+refs/heads/master: 1e86240f3fd33f8052141778ad3dffe2c96184d7
diff --git a/trunk/arch/i386/kernel/nmi.c b/trunk/arch/i386/kernel/nmi.c
index 2dd928a84645..acb351478e42 100644
--- a/trunk/arch/i386/kernel/nmi.c
+++ b/trunk/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 --git a/trunk/drivers/ide/ide-iops.c b/trunk/drivers/ide/ide-iops.c
index 657165297dc7..77703acaec17 100644
--- a/trunk/drivers/ide/ide-iops.c
+++ b/trunk/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, unsigned long timeout)
 		if (stat == 0xff)
 			return -ENODEV;
 		touch_softlockup_watchdog();
+		touch_nmi_watchdog();
 	}
 	return -EBUSY;
 }