[PATCH] i386 do_machine_check() is redundant.

Brian Gerst
2003-09-28T16:29:09Z

[-- Attachment #1: Type: text/plain, Size: 72 bytes --]

Use machine_check_vector in the entry code instead.

--
Brian Gerst

[-- Attachment #2: mce-1 --]
[-- Type: text/plain, Size: 1072 bytes --]

diff -urN linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/mce.c linux/arch/i386/kernel/cpu/mcheck/mce.c
--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/mce.c 2003-07-27 13:06:29.000000000 -0400
+++ linux/arch/i386/kernel/cpu/mcheck/mce.c 2003-09-28 12:23:16.267949368 -0400
@@ -26,11 +26,6 @@
/* Call the installed machine check handler for this CPU setup. */
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);
-}
-
/* This has to be run for each processor */
void __init mcheck_init(struct cpuinfo_x86 *c)
{
diff -urN linux-2.6.0-test6/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
--- linux-2.6.0-test6/arch/i386/kernel/entry.S 2003-09-28 10:20:13.981227536 -0400
+++ linux/arch/i386/kernel/entry.S 2003-09-28 12:23:16.268949216 -0400
@@ -595,7 +595,7 @@
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
pushl $0
- pushl $do_machine_check
+ pushl machine_check_vector
jmp error_code
#endif