Commit b5f1b31e authored by Brian Gerst's avatar Brian Gerst Committed by Linus Torvalds

[PATCH] Regparm for x86 machine check handlers

The patch to change traps and interrupts to the fastcall convention
missed the machine check handlers.
Signed-off-by: default avatarBrian Gerst <bgerst@didntduck.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aebeba09
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "mce.h" #include "mce.h"
/* Machine Check Handler For AMD Athlon/Duron */ /* Machine Check Handler For AMD Athlon/Duron */
static asmlinkage void k7_machine_check(struct pt_regs * regs, long error_code) static fastcall void k7_machine_check(struct pt_regs * regs, long error_code)
{ {
int recover=1; int recover=1;
u32 alow, ahigh, high, low; u32 alow, ahigh, high, low;
......
...@@ -22,13 +22,13 @@ int nr_mce_banks; ...@@ -22,13 +22,13 @@ int nr_mce_banks;
EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */ EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */
/* Handle unconfigured int18 (should never happen) */ /* Handle unconfigured int18 (should never happen) */
static asmlinkage void unexpected_machine_check(struct pt_regs * regs, long error_code) static fastcall void unexpected_machine_check(struct pt_regs * regs, long error_code)
{ {
printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id()); printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
} }
/* Call the installed machine check handler for this CPU setup. */ /* Call the installed machine check handler for this CPU setup. */
void asmlinkage (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check; void fastcall (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
/* This has to be run for each processor */ /* This has to be run for each processor */
void __init mcheck_init(struct cpuinfo_x86 *c) void __init mcheck_init(struct cpuinfo_x86 *c)
......
...@@ -7,7 +7,7 @@ void intel_p6_mcheck_init(struct cpuinfo_x86 *c); ...@@ -7,7 +7,7 @@ void intel_p6_mcheck_init(struct cpuinfo_x86 *c);
void winchip_mcheck_init(struct cpuinfo_x86 *c); void winchip_mcheck_init(struct cpuinfo_x86 *c);
/* Call the installed machine check handler for this CPU setup. */ /* Call the installed machine check handler for this CPU setup. */
extern asmlinkage void (*machine_check_vector)(struct pt_regs *, long error_code); extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
extern int mce_disabled __initdata; extern int mce_disabled __initdata;
extern int nr_mce_banks; extern int nr_mce_banks;
......
...@@ -159,7 +159,7 @@ static inline int intel_get_extended_msrs(struct intel_mce_extended_msrs *r) ...@@ -159,7 +159,7 @@ static inline int intel_get_extended_msrs(struct intel_mce_extended_msrs *r)
return mce_num_extended_msrs; return mce_num_extended_msrs;
} }
static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code) static fastcall void intel_machine_check(struct pt_regs * regs, long error_code)
{ {
int recover=1; int recover=1;
u32 alow, ahigh, high, low; u32 alow, ahigh, high, low;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "mce.h" #include "mce.h"
/* Machine check handler for Pentium class Intel */ /* Machine check handler for Pentium class Intel */
static asmlinkage void pentium_machine_check(struct pt_regs * regs, long error_code) static fastcall void pentium_machine_check(struct pt_regs * regs, long error_code)
{ {
u32 loaddr, hi, lotype; u32 loaddr, hi, lotype;
rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi); rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "mce.h" #include "mce.h"
/* Machine Check Handler For PII/PIII */ /* Machine Check Handler For PII/PIII */
static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code) static fastcall void intel_machine_check(struct pt_regs * regs, long error_code)
{ {
int recover=1; int recover=1;
u32 alow, ahigh, high, low; u32 alow, ahigh, high, low;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "mce.h" #include "mce.h"
/* Machine check handler for WinChip C6 */ /* Machine check handler for WinChip C6 */
static asmlinkage void winchip_machine_check(struct pt_regs * regs, long error_code) static fastcall void winchip_machine_check(struct pt_regs * regs, long error_code)
{ {
printk(KERN_EMERG "CPU0: Machine Check Exception.\n"); printk(KERN_EMERG "CPU0: Machine Check Exception.\n");
add_taint(TAINT_MACHINE_CHECK); add_taint(TAINT_MACHINE_CHECK);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment