From 3bc258ad87e5b0bbbca247b24ce8fac380c7d86b Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 23 Oct 2007 22:37:23 +0200 Subject: [PATCH] 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 --- arch/x86/kernel/cpu/mcheck/Makefile | 6 ++---- arch/x86/kernel/cpu/mcheck/{mce.c => mce_32.c} | 0 2 files changed, 2 insertions(+), 4 deletions(-) rename arch/x86/kernel/cpu/mcheck/{mce.c => mce_32.c} (100%) 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 similarity index 100% rename from arch/x86/kernel/cpu/mcheck/mce.c rename to arch/x86/kernel/cpu/mcheck/mce_32.c -- 2.20.1