---

yaml --- r: 65551 b: refs/heads/master c: 2ec1df4 h: refs/heads/master i: 65549: 37f83a9 65547: 575f658 65543: 7d012e8 65535: 9f7407a v: v3
git-mirror · Oct 11, 2007 · cca4ea2 · cca4ea2
1 parent 635251d
commit cca4ea2
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 → trunk/arch/x86/kernel/cpu/mtrr/Makefile b/trunk/arch/i386/kernel/cpu/mtrr/Makefile → trunk/arch/x86/kernel/cpu/mtrr/Makefile
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/amd.c → trunk/arch/x86/kernel/cpu/mtrr/amd.c b/trunk/arch/i386/kernel/cpu/mtrr/amd.c → trunk/arch/x86/kernel/cpu/mtrr/amd.c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/centaur.c → trunk/arch/x86/kernel/cpu/mtrr/centaur.c b/trunk/arch/i386/kernel/cpu/mtrr/centaur.c → trunk/arch/x86/kernel/cpu/mtrr/centaur.c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c → trunk/arch/x86/kernel/cpu/mtrr/cyrix.c b/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c → trunk/arch/x86/kernel/cpu/mtrr/cyrix.c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/generic.c → trunk/arch/x86/kernel/cpu/mtrr/generic.c b/trunk/arch/i386/kernel/cpu/mtrr/generic.c → trunk/arch/x86/kernel/cpu/mtrr/generic.c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/if.c → trunk/arch/x86/kernel/cpu/mtrr/if.c b/trunk/arch/i386/kernel/cpu/mtrr/if.c → trunk/arch/x86/kernel/cpu/mtrr/if.c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/main.c → trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/i386/kernel/cpu/mtrr/main.c → trunk/arch/x86/kernel/cpu/mtrr/main.c
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/mtrr.h → trunk/arch/x86/kernel/cpu/mtrr/mtrr.h b/trunk/arch/i386/kernel/cpu/mtrr/mtrr.h → trunk/arch/x86/kernel/cpu/mtrr/mtrr.h
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/state.c → trunk/arch/x86/kernel/cpu/mtrr/state.c b/trunk/arch/i386/kernel/cpu/mtrr/state.c → 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
@@ -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