diff --git a/[refs] b/[refs]
index d7c658ac387f..5f87bfd5ec06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9d19f4a51447930db002409945ad40a7a373cb0
+refs/heads/master: 378b39a4f91ab0846eb6e13d47ea812bc82b44d9
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 0a1987b4acc4..5e1537b62534 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -18,7 +18,7 @@ CFLAGS_tsc_64.o		:= $(nostackp)
 obj-y			:= process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
 obj-y			+= traps_$(BITS).o irq_$(BITS).o
 obj-y			+= time_$(BITS).o ioport.o ldt.o
-obj-y			+= setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o
+obj-y			+= setup_$(BITS).o i8259.o irqinit_$(BITS).o setup_percpu.o
 obj-$(CONFIG_X86_32)	+= probe_roms_32.o
 obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup_percpu.c
similarity index 100%
rename from trunk/arch/x86/kernel/setup.c
rename to trunk/arch/x86/kernel/setup_percpu.c