summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHuang Ying <ying.huang@intel.com>2011-01-04 22:38:09 -0500
committerIngo Molnar <mingo@elte.hu>2011-01-05 14:22:58 +0100
commit74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6 (patch)
treeefd1571b8f07acbff86ce708f6ff3dd410378362 /arch
parent554ec063982752e9a569ab9189eeffa3d96731b2 (diff)
downloadblackbird-op-linux-74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6.tar.gz
blackbird-op-linux-74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6.zip
x86, NMI: Add touch_nmi_watchdog to io_check_error delay
Prevent the long delay in io_check_error making NMI watchdog timeout. Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Don Zickus <dzickus@redhat.com> LKML-Reference: <1294198689-15447-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/traps.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index bb6f04167361..c76aaca5694d 100644
--- a/arch/x86/kernel/traps.c
+++ b/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);
OpenPOWER on IntegriCloud