Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / mcheck / p5.c

diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
index 94bc43d950cf1eb2c1e3db71940ab60e231cac2b..a18310aaae0cf4962cd7a2512e20ba8361667027 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
@@ -16,7 +16,7 @@
 #include "mce.h"
 
 /* Machine check handler for Pentium class Intel */
-static fastcall void pentium_machine_check(struct pt_regs * regs, long error_code)
+static void pentium_machine_check(struct pt_regs * regs, long error_code)
 {
        u32 loaddr, hi, lotype;
        rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi);