From be697ab3c389ad2ccdd6a39e36706ec4de2ffa51 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 20:35:16 +0100
Subject: [PATCH] --- yaml --- r: 136888 b: refs/heads/master c:
 2a05180fe2e5b414f0cb2ccfc80e6c90563e3c67 h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/x86/kernel/Makefile                       | 6 +-----
 trunk/arch/x86/kernel/apic/Makefile                  | 9 +++++++--
 trunk/arch/x86/kernel/{ => apic}/bigsmp_32.c         | 0
 trunk/arch/x86/kernel/{ => apic}/es7000_32.c         | 0
 trunk/arch/x86/kernel/{ => apic}/numaq_32.c          | 0
 trunk/arch/x86/kernel/{ => apic}/probe_32.c          | 0
 trunk/arch/x86/kernel/apic/{apic_64.c => probe_64.c} | 0
 trunk/arch/x86/kernel/{ => apic}/summit_32.c         | 0
 9 files changed, 9 insertions(+), 8 deletions(-)
 rename trunk/arch/x86/kernel/{ => apic}/bigsmp_32.c (100%)
 rename trunk/arch/x86/kernel/{ => apic}/es7000_32.c (100%)
 rename trunk/arch/x86/kernel/{ => apic}/numaq_32.c (100%)
 rename trunk/arch/x86/kernel/{ => apic}/probe_32.c (100%)
 rename trunk/arch/x86/kernel/apic/{apic_64.c => probe_64.c} (100%)
 rename trunk/arch/x86/kernel/{ => apic}/summit_32.c (100%)

diff --git a/[refs] b/[refs]
index a02ded229dc3..0391a8d7bc00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f62bae5009c1ba596cd475cafbc83e0570a36e26
+refs/heads/master: 2a05180fe2e5b414f0cb2ccfc80e6c90563e3c67
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 9139ff69471c..c70537d8c156 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/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/trunk/arch/x86/kernel/apic/Makefile b/trunk/arch/x86/kernel/apic/Makefile
index da20b70c4000..97f558db5c31 100644
--- a/trunk/arch/x86/kernel/apic/Makefile
+++ b/trunk/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/trunk/arch/x86/kernel/bigsmp_32.c b/trunk/arch/x86/kernel/apic/bigsmp_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/bigsmp_32.c
rename to trunk/arch/x86/kernel/apic/bigsmp_32.c
diff --git a/trunk/arch/x86/kernel/es7000_32.c b/trunk/arch/x86/kernel/apic/es7000_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/es7000_32.c
rename to trunk/arch/x86/kernel/apic/es7000_32.c
diff --git a/trunk/arch/x86/kernel/numaq_32.c b/trunk/arch/x86/kernel/apic/numaq_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/numaq_32.c
rename to trunk/arch/x86/kernel/apic/numaq_32.c
diff --git a/trunk/arch/x86/kernel/probe_32.c b/trunk/arch/x86/kernel/apic/probe_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/probe_32.c
rename to trunk/arch/x86/kernel/apic/probe_32.c
diff --git a/trunk/arch/x86/kernel/apic/apic_64.c b/trunk/arch/x86/kernel/apic/probe_64.c
similarity index 100%
rename from trunk/arch/x86/kernel/apic/apic_64.c
rename to trunk/arch/x86/kernel/apic/probe_64.c
diff --git a/trunk/arch/x86/kernel/summit_32.c b/trunk/arch/x86/kernel/apic/summit_32.c
similarity index 100%
rename from trunk/arch/x86/kernel/summit_32.c
rename to trunk/arch/x86/kernel/apic/summit_32.c