i386: move kernel/cpu/mcheck

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

diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile
index 778396c..09effc0 100644 (file)
--- a/arch/i386/kernel/cpu/Makefile
+++ b/arch/i386/kernel/cpu/Makefile
@@ -12,7 +12,7 @@ obj-y +=      intel.o intel_cacheinfo.o addon_cpuid_features.o
 obj-y  +=      nexgen.o
 obj-y  +=      umc.o
 
-obj-$(CONFIG_X86_MCE)  +=      mcheck/
+obj-$(CONFIG_X86_MCE)  +=      ../../../x86/kernel/cpu/mcheck/
 
 obj-$(CONFIG_MTRR)     +=      mtrr/
 obj-$(CONFIG_CPU_FREQ) +=      cpufreq/

diff --git a/arch/i386/kernel/cpu/mcheck/Makefile b/arch/x86/kernel/cpu/mcheck/Makefile
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/Makefile
rename to arch/x86/kernel/cpu/mcheck/Makefile

diff --git a/arch/i386/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/k7.c
rename to arch/x86/kernel/cpu/mcheck/k7.c

diff --git a/arch/i386/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/mce.c
rename to arch/x86/kernel/cpu/mcheck/mce.c

diff --git a/arch/i386/kernel/cpu/mcheck/mce.h b/arch/x86/kernel/cpu/mcheck/mce.h
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/mce.h
rename to arch/x86/kernel/cpu/mcheck/mce.h

diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/x86/kernel/cpu/mcheck/non-fatal.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/non-fatal.c
rename to arch/x86/kernel/cpu/mcheck/non-fatal.c

diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/p4.c
rename to arch/x86/kernel/cpu/mcheck/p4.c

diff --git a/arch/i386/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/p5.c
rename to arch/x86/kernel/cpu/mcheck/p5.c

diff --git a/arch/i386/kernel/cpu/mcheck/p6.c b/arch/x86/kernel/cpu/mcheck/p6.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/p6.c
rename to arch/x86/kernel/cpu/mcheck/p6.c

diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/therm_throt.c
rename to arch/x86/kernel/cpu/mcheck/therm_throt.c

diff --git a/arch/i386/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
similarity index 100%
rename from arch/i386/kernel/cpu/mcheck/winchip.c
rename to arch/x86/kernel/cpu/mcheck/winchip.c

diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64
index 8253617..1c9de79 100644 (file)
--- a/arch/x86_64/kernel/Makefile_64
+++ b/arch/x86_64/kernel/Makefile_64
@@ -48,7 +48,7 @@ obj-y                         += pcspeaker.o
 
 CFLAGS_vsyscall_64.o           := $(PROFILING) -g0
 
-therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
+therm_throt-y                   += ../../x86/kernel/cpu/mcheck/therm_throt.o
 bootflag-y                     += ../../i386/kernel/bootflag.o
 cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
 topology-y                     += ../../i386/kernel/topology.o