diff --git a/[refs] b/[refs]
index 23b00bad9c9f..fcffc97357db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93de1ef4543e80a1a9bfdb7a854d155f6530df2e
+refs/heads/master: 1d56734f9e51b21a92a02f526c278c037de65822
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index 9939968285ed..fc8d1319e911 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_SMP)		+= smp_64.o smpboot_64.o trampoline.o tsc_sync.o
 obj-y				+= apic_64.o  nmi_64.o
-obj-y				+= io_apic_64.o mpparse.o genapic_64.o genapic_flat.o
+obj-y				+= io_apic_64.o mpparse_64.o genapic_64.o genapic_flat.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_64.o crash_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_PM)		+= suspend.o
diff --git a/trunk/arch/x86_64/kernel/mpparse.c b/trunk/arch/x86_64/kernel/mpparse_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/mpparse.c
rename to trunk/arch/x86_64/kernel/mpparse_64.c