diff --git a/[refs] b/[refs]
index 8138b869a27d..66dbd38eb356 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b69915deee81842ba192c251573141ac3af86db
+refs/heads/master: 198a071dff9ee61973edf8c58f22ecd5bc4892c8
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
index a6b3ea5805cb..edf4c88a98d4 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.o genapic_flat.o
+obj-y				+= io_apic_64.o mpparse.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/genapic.c b/trunk/arch/x86_64/kernel/genapic_64.c
similarity index 100%
rename from trunk/arch/x86_64/kernel/genapic.c
rename to trunk/arch/x86_64/kernel/genapic_64.c