From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Fri, 3 Oct 2008 20:00:35 +0000 (+0200)
Subject: traps: x86_64: make io_check_error equal to the one on i386
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1c9af8a9f448abfe13f17fa76b7ca72b588a1edb;p=linux-beck.git

traps: x86_64: make io_check_error equal to the one on i386

Make io_check_error equal to the one on i386.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 00406c99aee4..7853f488cd6c 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/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);
 }