x86: prepare consolidation of cpu/ related Makefiles

Prepare the makefiles in x86/kernel/cpu and x86/kernel/cpu/mcheck to
be used by the x86_64 build as well.

No code change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 17 insertions, 14 deletions

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 778396c78d65..cfdb2f3bd763 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -2,19 +2,19 @@
 # Makefile for x86-compatible CPU details and quirks
 #
 
-obj-y   :=      common.o proc.o bugs.o
+obj-y                   := intel_cacheinfo.o addon_cpuid_features.o
 
-obj-y   +=      amd.o
-obj-y   +=      cyrix.o
-obj-y   +=      centaur.o
-obj-y   +=      transmeta.o
-obj-y   +=      intel.o intel_cacheinfo.o addon_cpuid_features.o
-obj-y   +=      nexgen.o
-obj-y   +=      umc.o
+obj-$(CONFIG_X86_32)    += common.o proc.o bugs.o
+obj-$(CONFIG_X86_32)    += amd.o
+obj-$(CONFIG_X86_32)    += cyrix.o
+obj-$(CONFIG_X86_32)    += centaur.o
+obj-$(CONFIG_X86_32)    += transmeta.o
+obj-$(CONFIG_X86_32)    += intel.o
+obj-$(CONFIG_X86_32)    += nexgen.o
+obj-$(CONFIG_X86_32)    += umc.o
 
-obj-$(CONFIG_X86_MCE)   +=      mcheck/
-
-obj-$(CONFIG_MTRR)      +=      mtrr/
-obj-$(CONFIG_CPU_FREQ)  +=      cpufreq/
+obj-$(CONFIG_X86_MCE)   += mcheck/
+obj-$(CONFIG_MTRR)      += mtrr/
+obj-$(CONFIG_CPU_FREQ)  += cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
diff --git a/arch/x86/kernel/cpu/mcheck/Makefile b/arch/x86/kernel/cpu/mcheck/Makefile
index f1ebe1c1c17a..1ba7e3f52769 100644
--- a/arch/x86/kernel/cpu/mcheck/Makefile
+++ b/arch/x86/kernel/cpu/mcheck/Makefile
@@ -1,2 +1,5 @@
-obj-y   =       mce.o k7.o p4.o p5.o p6.o winchip.o therm_throt.o
-obj-$(CONFIG_X86_MCE_NONFATAL)  +=      non-fatal.o
+obj-$(CONFIG_X86_32)            =  mce.o 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