From c18db0d7e299791c73d4dbe5ae7905b2ab8ba332 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:25 +0200 Subject: [PATCH] i386: move kernel/cpu/mcheck Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/i386/kernel/cpu/Makefile | 2 +- arch/{i386 => x86}/kernel/cpu/mcheck/Makefile | 0 arch/{i386 => x86}/kernel/cpu/mcheck/k7.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/mce.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/mce.h | 0 arch/{i386 => x86}/kernel/cpu/mcheck/non-fatal.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/p4.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/p5.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/p6.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/therm_throt.c | 0 arch/{i386 => x86}/kernel/cpu/mcheck/winchip.c | 0 arch/x86_64/kernel/Makefile_64 | 2 +- 12 files changed, 2 insertions(+), 2 deletions(-) rename arch/{i386 => x86}/kernel/cpu/mcheck/Makefile (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/k7.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/mce.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/mce.h (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/non-fatal.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/p4.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/p5.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/p6.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/therm_throt.c (100%) rename arch/{i386 => x86}/kernel/cpu/mcheck/winchip.c (100%) diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile index 778396c78d65..09effc02e35a 100644 --- 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 8253617af12e..1c9de796fa14 100644 --- 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 -- GitLab