diff --git a/[refs] b/[refs]
index 8afd9d84493a..d53e4b33eb67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b91e94a6b59b63175440795b25afcd4cbfbe5e5
+refs/heads/master: 5924be937acbd1b11adb7be9b9bfab7ceda49050
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index a4f047cb87a6..fff92c718b62 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_APM)		+= apm.o
-obj-$(CONFIG_X86_SMP)		+= smp.o smpboot.o tsc_sync.o
+obj-$(CONFIG_X86_SMP)		+= smp_32.o smpboot.o tsc_sync.o
 obj-$(CONFIG_SMP)		+= smpcommon.o
 obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
diff --git a/trunk/arch/i386/kernel/smp.c b/trunk/arch/i386/kernel/smp_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/smp.c
rename to trunk/arch/i386/kernel/smp_32.c