aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-17 20:35:16 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-17 20:35:47 +0100
commit2a05180fe2e5b414f0cb2ccfc80e6c90563e3c67 (patch)
tree5c14afab81ee44b44ec7ff7faf08fee2c165bf50
parentf62bae5009c1ba596cd475cafbc83e0570a36e26 (diff)
x86, apic: move remaining APIC drivers to arch/x86/kernel/apic/*
Move the 32-bit extended-arch APIC drivers to arch/x86/kernel/apic/ too, and rename apic_64.c to probe_64.c. Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/Makefile6
-rw-r--r--arch/x86/kernel/apic/Makefile9
-rw-r--r--arch/x86/kernel/apic/bigsmp_32.c (renamed from arch/x86/kernel/bigsmp_32.c)0
-rw-r--r--arch/x86/kernel/apic/es7000_32.c (renamed from arch/x86/kernel/es7000_32.c)0
-rw-r--r--arch/x86/kernel/apic/numaq_32.c (renamed from arch/x86/kernel/numaq_32.c)0
-rw-r--r--arch/x86/kernel/apic/probe_32.c (renamed from arch/x86/kernel/probe_32.c)0
-rw-r--r--arch/x86/kernel/apic/probe_64.c (renamed from arch/x86/kernel/apic/apic_64.c)0
-rw-r--r--arch/x86/kernel/apic/summit_32.c (renamed from arch/x86/kernel/summit_32.c)0
8 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 9139ff69471..c70537d8c15 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -30,7 +30,7 @@ obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
obj-y += time_$(BITS).o ioport.o ldt.o dumpstack.o
obj-y += setup.o i8259.o irqinit_$(BITS).o
obj-$(CONFIG_X86_VISWS) += visws_quirks.o
-obj-$(CONFIG_X86_32) += probe_32.o probe_roms_32.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
obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o
@@ -70,10 +70,6 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o
obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
-obj-$(CONFIG_X86_BIGSMP) += bigsmp_32.o
-obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
-obj-$(CONFIG_X86_ES7000) += es7000_32.o
-obj-$(CONFIG_X86_SUMMIT) += summit_32.o
obj-y += vsmp_64.o
obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_MODULES) += module_$(BITS).o
diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile
index da20b70c400..97f558db5c3 100644
--- a/arch/x86/kernel/apic/Makefile
+++ b/arch/x86/kernel/apic/Makefile
@@ -2,14 +2,19 @@
# Makefile for local APIC drivers and for the IO-APIC code
#
-obj-y := apic.o ipi.o nmi.o
+obj-y := apic.o probe_$(BITS).o ipi.o nmi.o
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
obj-$(CONFIG_SMP) += ipi.o
+obj-$
ifeq ($(CONFIG_X86_64),y)
-obj-y += apic_64.o apic_flat_64.o
+obj-y += apic_flat_64.o
obj-$(CONFIG_X86_X2APIC) += x2apic_cluster.o
obj-$(CONFIG_X86_X2APIC) += x2apic_phys.o
obj-$(CONFIG_X86_UV) += x2apic_uv_x.o
endif
+obj-$(CONFIG_X86_BIGSMP) += bigsmp_32.o
+obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
+obj-$(CONFIG_X86_ES7000) += es7000_32.o
+obj-$(CONFIG_X86_SUMMIT) += summit_32.o
diff --git a/arch/x86/kernel/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 0b1093394fd..0b1093394fd 100644
--- a/arch/x86/kernel/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 320f2d2e4e5..320f2d2e4e5 100644
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index d9d6d61eed8..d9d6d61eed8 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 5fa48332c5c..5fa48332c5c 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
diff --git a/arch/x86/kernel/apic/apic_64.c b/arch/x86/kernel/apic/probe_64.c
index 70935dd904d..70935dd904d 100644
--- a/arch/x86/kernel/apic/apic_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index cfe7b09015d..cfe7b09015d 100644
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c