From cca4ea233b12909dcb49d998feb41962010e4fbc Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:16:28 +0200 Subject: [PATCH] --- yaml --- r: 65551 b: refs/heads/master c: 2ec1df4130c60d1eb49dc0fa0ed15858fede6b05 h: refs/heads/master i: 65549: 37f83a953ac10cdfb4e768e1489f8f6d518bba17 65547: 575f6581bd2fb7b09c98d67def14b4c0659f17ff 65543: 7d012e83b1e1754864c9d44dadf04def75b727f9 65535: 9f7407a1ae7917d67e0caeb8494b65a264d36c67 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/Makefile | 2 +- trunk/arch/{i386 => x86}/kernel/cpu/mtrr/Makefile | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/amd.c | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/centaur.c | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/cyrix.c | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/generic.c | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/if.c | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/main.c | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/mtrr.h | 0 trunk/arch/{i386 => x86}/kernel/cpu/mtrr/state.c | 0 trunk/arch/x86_64/kernel/Makefile_64 | 2 +- 12 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/Makefile (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/amd.c (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/centaur.c (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/cyrix.c (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/generic.c (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/if.c (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/main.c (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/mtrr.h (100%) rename trunk/arch/{i386 => x86}/kernel/cpu/mtrr/state.c (100%) diff --git a/[refs] b/[refs] index 98724e7162cd..827ab3b20750 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee580dc91efd83e6b55955e7261e8ad2a0e08d1a +refs/heads/master: 2ec1df4130c60d1eb49dc0fa0ed15858fede6b05 diff --git a/trunk/arch/i386/kernel/cpu/Makefile b/trunk/arch/i386/kernel/cpu/Makefile index 8d9ce0232ada..6687f6d5ad2f 100644 --- a/trunk/arch/i386/kernel/cpu/Makefile +++ b/trunk/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/trunk/arch/i386/kernel/cpu/mtrr/Makefile b/trunk/arch/x86/kernel/cpu/mtrr/Makefile similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/Makefile rename to trunk/arch/x86/kernel/cpu/mtrr/Makefile diff --git a/trunk/arch/i386/kernel/cpu/mtrr/amd.c b/trunk/arch/x86/kernel/cpu/mtrr/amd.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/amd.c rename to trunk/arch/x86/kernel/cpu/mtrr/amd.c diff --git a/trunk/arch/i386/kernel/cpu/mtrr/centaur.c b/trunk/arch/x86/kernel/cpu/mtrr/centaur.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/centaur.c rename to trunk/arch/x86/kernel/cpu/mtrr/centaur.c diff --git a/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c b/trunk/arch/x86/kernel/cpu/mtrr/cyrix.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/cyrix.c rename to trunk/arch/x86/kernel/cpu/mtrr/cyrix.c diff --git a/trunk/arch/i386/kernel/cpu/mtrr/generic.c b/trunk/arch/x86/kernel/cpu/mtrr/generic.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/generic.c rename to trunk/arch/x86/kernel/cpu/mtrr/generic.c diff --git a/trunk/arch/i386/kernel/cpu/mtrr/if.c b/trunk/arch/x86/kernel/cpu/mtrr/if.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/if.c rename to trunk/arch/x86/kernel/cpu/mtrr/if.c diff --git a/trunk/arch/i386/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/main.c rename to trunk/arch/x86/kernel/cpu/mtrr/main.c diff --git a/trunk/arch/i386/kernel/cpu/mtrr/mtrr.h b/trunk/arch/x86/kernel/cpu/mtrr/mtrr.h similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/mtrr.h rename to trunk/arch/x86/kernel/cpu/mtrr/mtrr.h diff --git a/trunk/arch/i386/kernel/cpu/mtrr/state.c b/trunk/arch/x86/kernel/cpu/mtrr/state.c similarity index 100% rename from trunk/arch/i386/kernel/cpu/mtrr/state.c rename to trunk/arch/x86/kernel/cpu/mtrr/state.c diff --git a/trunk/arch/x86_64/kernel/Makefile_64 b/trunk/arch/x86_64/kernel/Makefile_64 index a6d8216084ad..e74805091034 100644 --- a/trunk/arch/x86_64/kernel/Makefile_64 +++ b/trunk/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