diff --git a/[refs] b/[refs]
index 140fde782ca6..535dae67f397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13a9cd42466e12113859c4d7b41561e8bbcaf09d
+refs/heads/master: bd751ae043e89e2e44e6af784df5a70694b1c9b7
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index 8c48cd7b399c..b4e36e69150e 100644
--- a/trunk/arch/x86_64/kernel/Makefile
+++ b/trunk/arch/x86_64/kernel/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_SMP)		+= smp_64.o smpboot.o trampoline.o tsc_sync.o
-obj-y				+= apic.o  nmi.o
+obj-y				+= apic_64.o  nmi.o
 obj-y				+= io_apic_64.o mpparse.o genapic.o genapic_flat.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_64.o crash_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/apic.c
rename to trunk/arch/x86_64/kernel/apic_64.c