x86_64: move mm
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 7317648..9832910 100644
--- a/arch/x86/mm/Makefile
+++ b/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/arch/x86_64/mm/Makefile_64 b/arch/x86/mm/Makefile_64
similarity index 87%
rename from arch/x86_64/mm/Makefile_64
rename to arch/x86/mm/Makefile_64
index 5c2883c..6bcb479 100644
--- a/arch/x86_64/mm/Makefile_64
+++ b/arch/x86/mm/Makefile_64
@@ -8,4 +8,3 @@
obj-$(CONFIG_K8_NUMA) += k8topology_64.o
obj-$(CONFIG_ACPI_NUMA) += srat_64.o
-hugetlbpage-y = ../../x86/mm/hugetlbpage.o
diff --git a/arch/x86_64/mm/extable_64.c b/arch/x86/mm/extable_64.c
similarity index 100%
rename from arch/x86_64/mm/extable_64.c
rename to arch/x86/mm/extable_64.c
diff --git a/arch/x86_64/mm/fault_64.c b/arch/x86/mm/fault_64.c
similarity index 100%
rename from arch/x86_64/mm/fault_64.c
rename to arch/x86/mm/fault_64.c
diff --git a/arch/x86_64/mm/init_64.c b/arch/x86/mm/init_64.c
similarity index 100%
rename from arch/x86_64/mm/init_64.c
rename to arch/x86/mm/init_64.c
diff --git a/arch/x86_64/mm/ioremap_64.c b/arch/x86/mm/ioremap_64.c
similarity index 100%
rename from arch/x86_64/mm/ioremap_64.c
rename to arch/x86/mm/ioremap_64.c
diff --git a/arch/x86_64/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
similarity index 100%
rename from arch/x86_64/mm/k8topology_64.c
rename to arch/x86/mm/k8topology_64.c
diff --git a/arch/x86_64/mm/mmap_64.c b/arch/x86/mm/mmap_64.c
similarity index 100%
rename from arch/x86_64/mm/mmap_64.c
rename to arch/x86/mm/mmap_64.c
diff --git a/arch/x86_64/mm/numa_64.c b/arch/x86/mm/numa_64.c
similarity index 100%
rename from arch/x86_64/mm/numa_64.c
rename to arch/x86/mm/numa_64.c
diff --git a/arch/x86_64/mm/pageattr_64.c b/arch/x86/mm/pageattr_64.c
similarity index 100%
rename from arch/x86_64/mm/pageattr_64.c
rename to arch/x86/mm/pageattr_64.c
diff --git a/arch/x86_64/mm/srat_64.c b/arch/x86/mm/srat_64.c
similarity index 100%
rename from arch/x86_64/mm/srat_64.c
rename to arch/x86/mm/srat_64.c
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 11ef2c3..4208a0d 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -75,7 +75,7 @@
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/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
deleted file mode 100644
index 7317648..0000000
--- a/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