From e32b54ab514b8c67644b499e22bf304e6da4ed5e Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Tue, 4 Jan 2011 22:38:09 -0500
Subject: [PATCH] --- yaml --- r: 223973 b: refs/heads/master c:
 74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6 h: refs/heads/master i:   223971:
 a7b6507be26fd0a126acbc4940f6d0076d971042 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/traps.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5453e1fb09bc..2f70aa585faa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 554ec063982752e9a569ab9189eeffa3d96731b2
+refs/heads/master: 74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6
diff --git a/trunk/arch/x86/kernel/traps.c b/trunk/arch/x86/kernel/traps.c
index bb6f04167361..c76aaca5694d 100644
--- a/trunk/arch/x86/kernel/traps.c
+++ b/trunk/arch/x86/kernel/traps.c
@@ -351,9 +351,11 @@ io_check_error(unsigned char reason, struct pt_regs *regs)
 	reason = (reason & 0xf) | 8;
 	outb(reason, 0x61);
 
-	i = 2000;
-	while (--i)
-		udelay(1000);
+	i = 20000;
+	while (--i) {
+		touch_nmi_watchdog();
+		udelay(100);
+	}
 
 	reason &= ~8;
 	outb(reason, 0x61);