summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 19:04:37 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-29 14:16:47 +0100
commitb3daa3a1a56cf09fb91773f3658692fd02d08bb1 (patch)
tree49c40bdeaafbef38680976ce19409ded853ddb5a
parent61b90b7ca10cc65d8b850ab542859dc593e5a381 (diff)
downloadlinux-b3daa3a1a56cf09fb91773f3658692fd02d08bb1.tar.gz
linux-b3daa3a1a56cf09fb91773f3658692fd02d08bb1.tar.bz2
linux-b3daa3a1a56cf09fb91773f3658692fd02d08bb1.zip
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>
-rw-r--r--arch/x86/kernel/Makefile1
-rw-r--r--arch/x86/kernel/bigsmp_32.c (renamed from arch/x86/mach-generic/bigsmp.c)0
-rw-r--r--arch/x86/mach-generic/Makefile1
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index a382ca6f6a17..4239847906a1 100644
--- 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 b/arch/x86/kernel/bigsmp_32.c
index 626f45ca4e7e..626f45ca4e7e 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/kernel/bigsmp_32.c
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 4ede08d309e6..05e4a7ca7742 100644
--- 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