summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-25 17:48:14 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:10:43 +0200
commit378b39a4f91ab0846eb6e13d47ea812bc82b44d9 (patch)
treec385859e25ca1611b90599fbb8feec96a71e2908 /arch
parentb9d19f4a51447930db002409945ad40a7a373cb0 (diff)
x86: rename setup.c to setup_percpu.c
some functions need to be moved to setup_numa.c after we merge setup32/64.c, some funcs need to be moved back to setup.c Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/Makefile2
-rw-r--r--arch/x86/kernel/setup_percpu.c (renamed from arch/x86/kernel/setup.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 0a1987b4acc..5e1537b6253 100644
--- a/arch/x86/kernel/Makefile
+++ b/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/arch/x86/kernel/setup.c b/arch/x86/kernel/setup_percpu.c
index 5c0c4bb5727..5c0c4bb5727 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup_percpu.c