[PATCH 4/9] traps: x86_64: make io_check_error equal to the one on i386
- From: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
- Date: Fri, 3 Oct 2008 22:00:35 +0200
Make io_check_error equal to the one on i386.
Signed-off-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
---
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 a7aef2d..6bce291 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -253,13 +253,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);
}
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 5/9] traps: i386: expand clear_mem_error and remove from mach_traps.h
- From: Alexander van Heukelum
- [PATCH 5/9] traps: i386: expand clear_mem_error and remove from mach_traps.h
- References:
- [PATCH 0/9] traps: x86: finalize unification of traps.c
- From: Alexander van Heukelum
- [PATCH 1/9] traps: x86: converge trap_init functions
- From: Alexander van Heukelum
- [PATCH 2/9] traps: x86_64: make math_state_restore more like i386
- From: Alexander van Heukelum
- [PATCH 3/9] traps: i386: use preempt_conditional_sti/cli in do_int3
- From: Alexander van Heukelum
- [PATCH 0/9] traps: x86: finalize unification of traps.c
- Prev by Date: [PATCH 5/9] traps: i386: expand clear_mem_error and remove from mach_traps.h
- Next by Date: Re: [PATCH] ELF: implement AT_RANDOM for future glibc use
- Previous by thread: [PATCH 3/9] traps: i386: use preempt_conditional_sti/cli in do_int3
- Next by thread: [PATCH 5/9] traps: i386: expand clear_mem_error and remove from mach_traps.h
- Index(es):
Relevant Pages
|
