From c3c7397d00538810dfd6d0fb76568eafe85c2efa Mon Sep 17 00:00:00 2001 From: Alexander van Heukelum Date: Fri, 3 Oct 2008 22:00:35 +0200 Subject: [PATCH] --- yaml --- r: 113563 b: refs/heads/master c: 1c9af8a9f448abfe13f17fa76b7ca72b588a1edb h: refs/heads/master i: 113561: 023cd3f38612e55a088543507e6d4a395ca90e0f 113559: fc8fa029f1d0a7982dbaaef12bc9ebe7e79b1e79 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/traps_64.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc59fc406efb..033766378b31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4915a35e35a037254550a2ba9f367a812bc37d40 +refs/heads/master: 1c9af8a9f448abfe13f17fa76b7ca72b588a1edb diff --git a/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c index 00406c99aee4..7853f488cd6c 100644 --- a/trunk/arch/x86/kernel/traps_64.c +++ b/trunk/arch/x86/kernel/traps_64.c @@ -252,13 +252,19 @@ mem_parity_error(unsigned char reason, struct pt_regs *regs) static notrace __kprobes void io_check_error(unsigned char reason, struct pt_regs *regs) { - printk("NMI: IOCK error (debug interrupt?)\n"); + unsigned long i; + + printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n"); show_registers(regs); /* Re-enable the IOCK line, wait for a few seconds */ reason = (reason & 0xf) | 8; outb(reason, 0x61); - mdelay(2000); + + i = 2000; + while (--i) + udelay(1000); + reason &= ~8; outb(reason, 0x61); }