diff --git a/[refs] b/[refs]
index f33a450b982f..3e2e7d018854 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30271a74772402764997e84cc5f6cab57d36418d
+refs/heads/master: 4f09b00fce5ba7bc00425f91860e81571472fbe8
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index c731008620da..65ce290d7387 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_APM)		+= apm.o
 obj-$(CONFIG_X86_SMP)		+= smp_32.o smpboot_32.o tsc_sync.o
-obj-$(CONFIG_SMP)		+= smpcommon.o
+obj-$(CONFIG_SMP)		+= smpcommon_32.o
 obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic_32.o nmi_32.o
diff --git a/trunk/arch/i386/kernel/smpcommon.c b/trunk/arch/i386/kernel/smpcommon_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/smpcommon.c
rename to trunk/arch/i386/kernel/smpcommon_32.c