From: Andrew Morton i386 allmodconfig: arch/x86/kernel/cpu/mcheck/p4.o: In function `smp_thermal_interrupt': arch/x86/kernel/cpu/mcheck/p4.c:61: multiple definition of `smp_thermal_interrupt' arch/x86/kernel/cpu/mcheck/mce_thermal.o:arch/x86/kernel/cpu/mcheck/mce_thermal.c:17: first defined here /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: Warning: size of symbol `smp_thermal_interrupt' changed from 4 in arch/x86/kernel/cpu/mcheck/mce_thermal.o to 43 in arch/x86/kernel/cpu/mcheck/p4.o /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: Warning: type of symbol `smp_thermal_interrupt' changed from 1 to 2 in arch/x86/kernel/cpu/mcheck/p4.o Cc: Russell Leidich Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86/kernel/cpu/mcheck/p4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86/kernel/cpu/mcheck/p4.c~x86-amd-thermal-interrupt-support-fix-2 arch/x86/kernel/cpu/mcheck/p4.c --- a/arch/x86/kernel/cpu/mcheck/p4.c~x86-amd-thermal-interrupt-support-fix-2 +++ a/arch/x86/kernel/cpu/mcheck/p4.c @@ -57,7 +57,7 @@ static void intel_thermal_interrupt(stru /* Thermal interrupt handler for this CPU setup */ static void (*vendor_thermal_interrupt)(struct pt_regs *regs) = unexpected_thermal_interrupt; -void smp_thermal_interrupt(struct pt_regs *regs) +void __attribute__((weak)) smp_thermal_interrupt(struct pt_regs *regs) { irq_enter(); vendor_thermal_interrupt(regs); _