x86, bigsmp: consolidate code

Move all code to arch/x86/kernel/bigsmp_32.c. With this it ceases to rely on any build-time subarch features. Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · Jan 29, 2009 · b3daa3a · b3daa3a
1 parent 61b90b7
commit b3daa3a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
@@ -71,6 +71,7 @@ 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

diff --git a/arch/x86/mach-generic/bigsmp.c → arch/x86/kernel/bigsmp_32.c b/arch/x86/mach-generic/bigsmp.c → arch/x86/kernel/bigsmp_32.c
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
@@ -5,4 +5,3 @@
 EXTRA_CFLAGS			:= -Iarch/x86/kernel
 
 obj-y				:= probe.o default.o
-obj-$(CONFIG_X86_BIGSMP)	+= bigsmp.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@
		EXTRA_CFLAGS := -Iarch/x86/kernel

		obj-y := probe.o default.o
		obj-$(CONFIG_X86_BIGSMP) += bigsmp.o