Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / i386 / kernel / traps.c

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 6dfbd46..5b65cb8 100644 (file)
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -409,7 +409,8 @@ void die(const char * str, struct pt_regs * regs, long err)
                        printk(KERN_EMERG "EIP: [<%08lx>] ", regs->eip);
                        print_symbol("%s", regs->eip);
                        printk(" SS:ESP %04x:%08lx\n", ss, esp);
-               } else
+               }
+               else
                        regs = NULL;
        } else
                printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
@@ -704,18 +705,11 @@ static void mem_parity_error(unsigned char reason, struct pt_regs * regs)
 
 static void io_check_error(unsigned char reason, struct pt_regs * regs)
 {
-       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);
-       i = 2000;
-       while (--i) udelay(1000);
-       reason &= ~8;
-       outb(reason, 0x61);
+       clear_io_check_error(reason);
 }
 
 static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)