From f7627e2513987bb5d4e8cb13c4e0a478352141ac Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:58 +0200 Subject: [PATCH] i386: move kernel/cpu Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/i386/kernel/Makefile_32 | 2 +- arch/{i386 => x86}/kernel/cpu/Makefile | 0 arch/{i386 => x86}/kernel/cpu/addon_cpuid_features.c | 0 arch/{i386 => x86}/kernel/cpu/amd.c | 0 arch/{i386 => x86}/kernel/cpu/bugs.c | 0 arch/{i386 => x86}/kernel/cpu/centaur.c | 0 arch/{i386 => x86}/kernel/cpu/common.c | 0 arch/{i386 => x86}/kernel/cpu/cpu.h | 0 arch/{i386 => x86}/kernel/cpu/cyrix.c | 0 arch/{i386 => x86}/kernel/cpu/intel.c | 0 arch/{i386 => x86}/kernel/cpu/intel_cacheinfo.c | 0 arch/{i386 => x86}/kernel/cpu/nexgen.c | 0 arch/{i386 => x86}/kernel/cpu/perfctr-watchdog.c | 0 arch/{i386 => x86}/kernel/cpu/proc.c | 0 arch/{i386 => x86}/kernel/cpu/transmeta.c | 0 arch/{i386 => x86}/kernel/cpu/umc.c | 0 arch/x86_64/kernel/Makefile_64 | 6 +++--- 17 files changed, 4 insertions(+), 4 deletions(-) rename arch/{i386 => x86}/kernel/cpu/Makefile (100%) rename arch/{i386 => x86}/kernel/cpu/addon_cpuid_features.c (100%) rename arch/{i386 => x86}/kernel/cpu/amd.c (100%) rename arch/{i386 => x86}/kernel/cpu/bugs.c (100%) rename arch/{i386 => x86}/kernel/cpu/centaur.c (100%) rename arch/{i386 => x86}/kernel/cpu/common.c (100%) rename arch/{i386 => x86}/kernel/cpu/cpu.h (100%) rename arch/{i386 => x86}/kernel/cpu/cyrix.c (100%) rename arch/{i386 => x86}/kernel/cpu/intel.c (100%) rename arch/{i386 => x86}/kernel/cpu/intel_cacheinfo.c (100%) rename arch/{i386 => x86}/kernel/cpu/nexgen.c (100%) rename arch/{i386 => x86}/kernel/cpu/perfctr-watchdog.c (100%) rename arch/{i386 => x86}/kernel/cpu/proc.c (100%) rename arch/{i386 => x86}/kernel/cpu/transmeta.c (100%) rename arch/{i386 => x86}/kernel/cpu/umc.c (100%) diff --git a/arch/i386/kernel/Makefile_32 b/arch/i386/kernel/Makefile_32 index af8304b921d..5096f486d38 100644 --- a/arch/i386/kernel/Makefile_32 +++ b/arch/i386/kernel/Makefile_32 @@ -10,7 +10,7 @@ obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ quirks.o i8237.o topology.o alternative.o i8253_32.o tsc_32.o obj-$(CONFIG_STACKTRACE) += stacktrace.o -obj-y += cpu/ +obj-y += ../../x86/kernel/cpu/ obj-y += ../../x86/kernel/acpi/ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot_32.o obj-$(CONFIG_MCA) += mca_32.o diff --git a/arch/i386/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile similarity index 100% rename from arch/i386/kernel/cpu/Makefile rename to arch/x86/kernel/cpu/Makefile diff --git a/arch/i386/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c similarity index 100% rename from arch/i386/kernel/cpu/addon_cpuid_features.c rename to arch/x86/kernel/cpu/addon_cpuid_features.c diff --git a/arch/i386/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c similarity index 100% rename from arch/i386/kernel/cpu/amd.c rename to arch/x86/kernel/cpu/amd.c diff --git a/arch/i386/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c similarity index 100% rename from arch/i386/kernel/cpu/bugs.c rename to arch/x86/kernel/cpu/bugs.c diff --git a/arch/i386/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c similarity index 100% rename from arch/i386/kernel/cpu/centaur.c rename to arch/x86/kernel/cpu/centaur.c diff --git a/arch/i386/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c similarity index 100% rename from arch/i386/kernel/cpu/common.c rename to arch/x86/kernel/cpu/common.c diff --git a/arch/i386/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h similarity index 100% rename from arch/i386/kernel/cpu/cpu.h rename to arch/x86/kernel/cpu/cpu.h diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c similarity index 100% rename from arch/i386/kernel/cpu/cyrix.c rename to arch/x86/kernel/cpu/cyrix.c diff --git a/arch/i386/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c similarity index 100% rename from arch/i386/kernel/cpu/intel.c rename to arch/x86/kernel/cpu/intel.c diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c similarity index 100% rename from arch/i386/kernel/cpu/intel_cacheinfo.c rename to arch/x86/kernel/cpu/intel_cacheinfo.c diff --git a/arch/i386/kernel/cpu/nexgen.c b/arch/x86/kernel/cpu/nexgen.c similarity index 100% rename from arch/i386/kernel/cpu/nexgen.c rename to arch/x86/kernel/cpu/nexgen.c diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c similarity index 100% rename from arch/i386/kernel/cpu/perfctr-watchdog.c rename to arch/x86/kernel/cpu/perfctr-watchdog.c diff --git a/arch/i386/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c similarity index 100% rename from arch/i386/kernel/cpu/proc.c rename to arch/x86/kernel/cpu/proc.c diff --git a/arch/i386/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c similarity index 100% rename from arch/i386/kernel/cpu/transmeta.c rename to arch/x86/kernel/cpu/transmeta.c diff --git a/arch/i386/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c similarity index 100% rename from arch/i386/kernel/cpu/umc.c rename to arch/x86/kernel/cpu/umc.c diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64 index e7480509103..690aebf37c3 100644 --- a/arch/x86_64/kernel/Makefile_64 +++ b/arch/x86_64/kernel/Makefile_64 @@ -53,11 +53,11 @@ bootflag-y += ../../i386/kernel/bootflag.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o topology-y += ../../i386/kernel/topology.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o -intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o -addon_cpuid_features-y += ../../i386/kernel/cpu/addon_cpuid_features.o +intel_cacheinfo-y += ../../x86/kernel/cpu/intel_cacheinfo.o +addon_cpuid_features-y += ../../x86/kernel/cpu/addon_cpuid_features.o quirks-y += ../../i386/kernel/quirks.o i8237-y += ../../i386/kernel/i8237.o msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o alternative-y += ../../i386/kernel/alternative.o pcspeaker-y += ../../i386/kernel/pcspeaker.o -perfctr-watchdog-y += ../../i386/kernel/cpu/perfctr-watchdog.o +perfctr-watchdog-y += ../../x86/kernel/cpu/perfctr-watchdog.o -- 2.20.1