---

yaml --- r: 32931 b: refs/heads/master c: 1e86240 h: refs/heads/master i: 32929: 00437ed 32927: ef213ca v: v3
git-mirror · Jul 31, 2006 · 3392abc · 3392abc
1 parent 0a7e925
commit 3392abc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
@@ Expand Down @@