summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglxlinutronix.de>2007-10-23 22:37:23 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-23 22:37:23 +0200
commit3bc258ad87e5b0bbbca247b24ce8fac380c7d86b (patch)
tree30f6919ee856f49b892b7e2074104147b05d4926 /arch
parent34d19e29c9402b6149c128517f73e7773d5838bf (diff)
downloadblackbird-op-linux-3bc258ad87e5b0bbbca247b24ce8fac380c7d86b.tar.gz
blackbird-op-linux-3bc258ad87e5b0bbbca247b24ce8fac380c7d86b.zip
x86: prepare consolidation of cpu/ related code usage
Move mce.c to mce_32.c to allow the later move of the x86_64 mce.c from arch/x86/kernel/ to ...kernel/cpu/mcheck No code change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/mcheck/Makefile6
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_32.c (renamed from arch/x86/kernel/cpu/mcheck/mce.c)0
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/Makefile b/arch/x86/kernel/cpu/mcheck/Makefile
index 1ba7e3f52769..403e720497ee 100644
--- a/arch/x86/kernel/cpu/mcheck/Makefile
+++ b/arch/x86/kernel/cpu/mcheck/Makefile
@@ -1,5 +1,3 @@
-obj-$(CONFIG_X86_32) = mce.o k7.o p4.o p5.o p6.o winchip.o
+obj-y = mce_$(BITS).o therm_throt.o
+obj-$(CONFIG_X86_32) += k7.o p4.o p5.o p6.o winchip.o
obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o
-
-# shared between i386 and x86_64
-obj-y += therm_throt.o
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce_32.c
index 34c781eddee4..34c781eddee4 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_32.c
OpenPOWER on IntegriCloud