diff options
| author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-10-03 22:00:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:33:24 +0200 |
| commit | 1c9af8a9f448abfe13f17fa76b7ca72b588a1edb (patch) | |
| tree | 110164ddbd9c0506190bba9818f1f5c7b2067b07 /arch | |
| parent | 4915a35e35a037254550a2ba9f367a812bc37d40 (diff) | |
| download | op-kernel-dev-1c9af8a9f448abfe13f17fa76b7ca72b588a1edb.zip op-kernel-dev-1c9af8a9f448abfe13f17fa76b7ca72b588a1edb.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/traps_64.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index 00406c9..7853f48 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); } |
