Skip to contentSkip to conversation

Small bluesmoke patch

PATCH New Brian Gerst 1 participant 1 message Dec 4, 2001

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Small bluesmoke patch

This patch eliminates the do_machine_check function, by using the machine_check_vector directly from the asm entry stub.

Signature · 1 line
						Brian Gerst
arch/i386/kernel/bluesmoke.c +1 -10
diff -urN linux-2.5.1-pre2/arch/i386/kernel/bluesmoke.c linux/arch/i386/kernel/bluesmoke.c
@@ -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
arch/i386/kernel/entry.S +1 -1
diff -urN linux-2.5.1-pre2/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
@@ -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)