---

yaml --- r: 65579 b: refs/heads/master c: 95119fb h: refs/heads/master i: 65577: de08d32 65575: b01652a v: v3
git-mirror · Oct 11, 2007 · ba9eac1 · ba9eac1
1 parent b8a8aab
commit ba9eac1
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a6c8d5a7e92a3e8db30fa0c5956a29c79d7e5a3
+refs/heads/master: 95119fbd87aabc263746731462062af5a38c0222
diff --git a/trunk/arch/x86/mm/Makefile b/trunk/arch/x86/mm/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
 include ${srctree}/arch/x86/mm/Makefile_32
 else
-include ${srctree}/arch/x86_64/mm/Makefile_64
+include ${srctree}/arch/x86/mm/Makefile_64
 endif
diff --git a/trunk/arch/x86_64/mm/Makefile_64 → trunk/arch/x86/mm/Makefile_64 b/trunk/arch/x86_64/mm/Makefile_64 → trunk/arch/x86/mm/Makefile_64
@@ -8,4 +8,3 @@ obj-$(CONFIG_NUMA) += numa_64.o
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA) += srat_64.o
 
-hugetlbpage-y = ../../x86/mm/hugetlbpage.o
diff --git a/trunk/arch/x86_64/mm/extable_64.c → trunk/arch/x86/mm/extable_64.c b/trunk/arch/x86_64/mm/extable_64.c → trunk/arch/x86/mm/extable_64.c
diff --git a/trunk/arch/x86_64/mm/fault_64.c → trunk/arch/x86/mm/fault_64.c b/trunk/arch/x86_64/mm/fault_64.c → trunk/arch/x86/mm/fault_64.c
diff --git a/trunk/arch/x86_64/mm/init_64.c → trunk/arch/x86/mm/init_64.c b/trunk/arch/x86_64/mm/init_64.c → trunk/arch/x86/mm/init_64.c
diff --git a/trunk/arch/x86_64/mm/ioremap_64.c → trunk/arch/x86/mm/ioremap_64.c b/trunk/arch/x86_64/mm/ioremap_64.c → trunk/arch/x86/mm/ioremap_64.c
diff --git a/trunk/arch/x86_64/mm/k8topology_64.c → trunk/arch/x86/mm/k8topology_64.c b/trunk/arch/x86_64/mm/k8topology_64.c → trunk/arch/x86/mm/k8topology_64.c
diff --git a/trunk/arch/x86_64/mm/mmap_64.c → trunk/arch/x86/mm/mmap_64.c b/trunk/arch/x86_64/mm/mmap_64.c → trunk/arch/x86/mm/mmap_64.c
diff --git a/trunk/arch/x86_64/mm/numa_64.c → trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86_64/mm/numa_64.c → trunk/arch/x86/mm/numa_64.c
diff --git a/trunk/arch/x86_64/mm/pageattr_64.c → trunk/arch/x86/mm/pageattr_64.c b/trunk/arch/x86_64/mm/pageattr_64.c → trunk/arch/x86/mm/pageattr_64.c
diff --git a/trunk/arch/x86_64/mm/srat_64.c → trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86_64/mm/srat_64.c → trunk/arch/x86/mm/srat_64.c
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
@@ -75,7 +75,7 @@ head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/k
 
 libs-y 					+= arch/x86/lib/
 core-y					+= arch/x86_64/kernel/ \
-					   arch/x86_64/mm/ \
+					   arch/x86/mm/ \
 					   arch/x86/crypto/ \
 					   arch/x86/vdso/
 core-$(CONFIG_IA32_EMULATION)		+= arch/x86_64/ia32/

diff --git a/trunk/arch/x86_64/mm/Makefile b/trunk/arch/x86_64/mm/Makefile
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,3 @@ obj-$(CONFIG_NUMA) += numa_64.o
		obj-$(CONFIG_K8_NUMA) += k8topology_64.o
		obj-$(CONFIG_ACPI_NUMA) += srat_64.o

		hugetlbpage-y = ../../x86/mm/hugetlbpage.o