From: Thomas Gleixner Date: Tue, 23 Oct 2007 20:37:23 +0000 (+0200) Subject: x86: prepare consolidation of cpu/ related code usage X-Git-Tag: v2.6.24-rc1~18^2~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3bc258ad87e5b0bbbca247b24ce8fac380c7d86b;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/cpu/mcheck/Makefile b/arch/x86/kernel/cpu/mcheck/Makefile index 1ba7e3f5276..403e720497e 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 similarity index 100% rename from arch/x86/kernel/cpu/mcheck/mce.c rename to arch/x86/kernel/cpu/mcheck/mce_32.c