diff -urN linux-2.5.1-pre2/arch/i386/kernel/bluesmoke.c linux/arch/i386/kernel/bluesmoke.c
--- linux-2.5.1-pre2/arch/i386/kernel/bluesmoke.c Mon Nov 12 12:59:43 2001
+++ linux/arch/i386/kernel/bluesmoke.c Tue Nov 27 15:01:50 2001
@@ -98,16 +98,7 @@
printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
}
-/*
- * Call the installed machine check handler for this CPU setup.
- */
-
-static void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
-
-asmlinkage void do_machine_check(struct pt_regs * regs, long error_code)
-{
- machine_check_vector(regs, error_code);
-}
+void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
/*
* Set up machine check reporting for Intel processors
diff -urN linux-2.5.1-pre2/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
--- linux-2.5.1-pre2/arch/i386/kernel/entry.S Fri Nov 2 20:18:49 2001
+++ linux/arch/i386/kernel/entry.S Tue Nov 27 15:01:17 2001
@@ -386,7 +386,7 @@
ENTRY(machine_check)
pushl $0
- pushl $ SYMBOL_NAME(do_machine_check)
+ pushl SYMBOL_NAME(machine_check_vector)
jmp error_code
ENTRY(spurious_interrupt_bug)