Commit 74d91e3c authored Jan 04, 2011 by Huang Ying Committed by Ingo Molnar Jan 05, 2011

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>

parent 554ec063

arch/x86/kernel/traps.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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);