From 2ec1df4130c60d1eb49dc0fa0ed15858fede6b05 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:16:28 +0200
Subject: [PATCH] i386: move kernel/cpu/mtrr
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/i386/kernel/cpu/Makefile | 2 +-
arch/{i386 => x86}/kernel/cpu/mtrr/Makefile | 0
arch/{i386 => x86}/kernel/cpu/mtrr/amd.c | 0
arch/{i386 => x86}/kernel/cpu/mtrr/centaur.c | 0
arch/{i386 => x86}/kernel/cpu/mtrr/cyrix.c | 0
arch/{i386 => x86}/kernel/cpu/mtrr/generic.c | 0
arch/{i386 => x86}/kernel/cpu/mtrr/if.c | 0
arch/{i386 => x86}/kernel/cpu/mtrr/main.c | 0
arch/{i386 => x86}/kernel/cpu/mtrr/mtrr.h | 0
arch/{i386 => x86}/kernel/cpu/mtrr/state.c | 0
arch/x86_64/kernel/Makefile_64 | 2 +-
11 files changed, 2 insertions(+), 2 deletions(-)
rename arch/{i386 => x86}/kernel/cpu/mtrr/Makefile (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/amd.c (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/centaur.c (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/cyrix.c (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/generic.c (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/if.c (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/main.c (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/mtrr.h (100%)
rename arch/{i386 => x86}/kernel/cpu/mtrr/state.c (100%)
diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile
index 8d9ce0232ada0..6687f6d5ad2f9 100644
--- a/arch/i386/kernel/cpu/Makefile
+++ b/arch/i386/kernel/cpu/Makefile
@@ -14,7 +14,7 @@ obj-y += umc.o
obj-$(CONFIG_X86_MCE) += ../../../x86/kernel/cpu/mcheck/
-obj-$(CONFIG_MTRR) += mtrr/
+obj-$(CONFIG_MTRR) += ../../../x86/kernel/cpu/mtrr/
obj-$(CONFIG_CPU_FREQ) += ../../../x86/kernel/cpu/cpufreq/
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
diff --git a/arch/i386/kernel/cpu/mtrr/Makefile b/arch/x86/kernel/cpu/mtrr/Makefile
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/Makefile
rename to arch/x86/kernel/cpu/mtrr/Makefile
diff --git a/arch/i386/kernel/cpu/mtrr/amd.c b/arch/x86/kernel/cpu/mtrr/amd.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/amd.c
rename to arch/x86/kernel/cpu/mtrr/amd.c
diff --git a/arch/i386/kernel/cpu/mtrr/centaur.c b/arch/x86/kernel/cpu/mtrr/centaur.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/centaur.c
rename to arch/x86/kernel/cpu/mtrr/centaur.c
diff --git a/arch/i386/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/cyrix.c
rename to arch/x86/kernel/cpu/mtrr/cyrix.c
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/generic.c
rename to arch/x86/kernel/cpu/mtrr/generic.c
diff --git a/arch/i386/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/if.c
rename to arch/x86/kernel/cpu/mtrr/if.c
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/main.c
rename to arch/x86/kernel/cpu/mtrr/main.c
diff --git a/arch/i386/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/mtrr.h
rename to arch/x86/kernel/cpu/mtrr/mtrr.h
diff --git a/arch/i386/kernel/cpu/mtrr/state.c b/arch/x86/kernel/cpu/mtrr/state.c
similarity index 100%
rename from arch/i386/kernel/cpu/mtrr/state.c
rename to arch/x86/kernel/cpu/mtrr/state.c
diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64
index a6d8216084ade..e748050910342 100644
--- a/arch/x86_64/kernel/Makefile_64
+++ b/arch/x86_64/kernel/Makefile_64
@@ -15,7 +15,7 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-$(CONFIG_X86_MCE) += mce_64.o therm_throt.o
obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o
obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o
-obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/
+obj-$(CONFIG_MTRR) += ../../x86/kernel/cpu/mtrr/
obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_MICROCODE) += microcode.o
--
GitLab