From ba9eac1cd49afb95c0c3e1e47624a435368b0c5f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:17:18 +0200
Subject: [PATCH] --- yaml --- r: 65579 b: refs/heads/master c:
 95119fbd87aabc263746731462062af5a38c0222 h: refs/heads/master i:   65577:
 de08d3220c3ef24599c18f1254287846c18bf943   65575:
 b01652aebcc575dcfe8bfd20025b85b96d32e95d v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/x86/mm/Makefile                    | 2 +-
 trunk/arch/{x86_64 => x86}/mm/Makefile_64     | 1 -
 trunk/arch/{x86_64 => x86}/mm/extable_64.c    | 0
 trunk/arch/{x86_64 => x86}/mm/fault_64.c      | 0
 trunk/arch/{x86_64 => x86}/mm/init_64.c       | 0
 trunk/arch/{x86_64 => x86}/mm/ioremap_64.c    | 0
 trunk/arch/{x86_64 => x86}/mm/k8topology_64.c | 0
 trunk/arch/{x86_64 => x86}/mm/mmap_64.c       | 0
 trunk/arch/{x86_64 => x86}/mm/numa_64.c       | 0
 trunk/arch/{x86_64 => x86}/mm/pageattr_64.c   | 0
 trunk/arch/{x86_64 => x86}/mm/srat_64.c       | 0
 trunk/arch/x86_64/Makefile                    | 2 +-
 trunk/arch/x86_64/mm/Makefile                 | 5 -----
 14 files changed, 3 insertions(+), 9 deletions(-)
 rename trunk/arch/{x86_64 => x86}/mm/Makefile_64 (87%)
 rename trunk/arch/{x86_64 => x86}/mm/extable_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/fault_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/init_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/ioremap_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/k8topology_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/mmap_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/numa_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/pageattr_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/mm/srat_64.c (100%)
 delete mode 100644 trunk/arch/x86_64/mm/Makefile

diff --git a/[refs] b/[refs]
index 7df07185a6c3..8cdfdb8abcfb 100644
--- 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
index 7317648e6587..983291096848 100644
--- 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 b/trunk/arch/x86/mm/Makefile_64
similarity index 87%
rename from trunk/arch/x86_64/mm/Makefile_64
rename to trunk/arch/x86/mm/Makefile_64
index 5c2883cad11b..6bcb47945b87 100644
--- a/trunk/arch/x86_64/mm/Makefile_64
+++ b/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 b/trunk/arch/x86/mm/extable_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/extable_64.c
rename to trunk/arch/x86/mm/extable_64.c
diff --git a/trunk/arch/x86_64/mm/fault_64.c b/trunk/arch/x86/mm/fault_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/fault_64.c
rename to trunk/arch/x86/mm/fault_64.c
diff --git a/trunk/arch/x86_64/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/init_64.c
rename to trunk/arch/x86/mm/init_64.c
diff --git a/trunk/arch/x86_64/mm/ioremap_64.c b/trunk/arch/x86/mm/ioremap_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/ioremap_64.c
rename to trunk/arch/x86/mm/ioremap_64.c
diff --git a/trunk/arch/x86_64/mm/k8topology_64.c b/trunk/arch/x86/mm/k8topology_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/k8topology_64.c
rename to trunk/arch/x86/mm/k8topology_64.c
diff --git a/trunk/arch/x86_64/mm/mmap_64.c b/trunk/arch/x86/mm/mmap_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/mmap_64.c
rename to trunk/arch/x86/mm/mmap_64.c
diff --git a/trunk/arch/x86_64/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/numa_64.c
rename to trunk/arch/x86/mm/numa_64.c
diff --git a/trunk/arch/x86_64/mm/pageattr_64.c b/trunk/arch/x86/mm/pageattr_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/pageattr_64.c
rename to trunk/arch/x86/mm/pageattr_64.c
diff --git a/trunk/arch/x86_64/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c
similarity index 100%
rename from trunk/arch/x86_64/mm/srat_64.c
rename to trunk/arch/x86/mm/srat_64.c
diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile
index 11ef2c37ba57..4208a0ded529 100644
--- 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
deleted file mode 100644
index 7317648e6587..000000000000
--- a/trunk/arch/x86_64/mm/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/mm/Makefile_32
-else
-include ${srctree}/arch/x86_64/mm/Makefile_64
-endif