i386: move mm

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 776d8dcf2340e65b80cc1474b39441f94c769b0e..cbdc14fddc3a41cd0b31d4cd947b2b43ff77e74b 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -103,7 +103,7 @@ head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
 
 libs-y                                         += arch/x86/lib/
 core-y                                 += arch/i386/kernel/ \
-                                          arch/i386/mm/ \
+                                          arch/x86/mm/ \
                                           $(mcore-y)/ \
                                           arch/x86/crypto/
 drivers-$(CONFIG_MATH_EMULATION)       += arch/x86/math-emu/

diff --git a/arch/i386/mm/Makefile b/arch/x86/mm/Makefile
similarity index 65%
rename from arch/i386/mm/Makefile
rename to arch/x86/mm/Makefile
index 4042f8563a1699190d0fb026dfb5c15a29234d7e..7317648e6587c07e3765f4bc93b5226b44179605 100644 (file)
--- a/arch/i386/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/mm/Makefile_32
+include ${srctree}/arch/x86/mm/Makefile_32
 else
 include ${srctree}/arch/x86_64/mm/Makefile_64
 endif

diff --git a/arch/i386/mm/Makefile_32 b/arch/x86/mm/Makefile_32
similarity index 100%
rename from arch/i386/mm/Makefile_32
rename to arch/x86/mm/Makefile_32

diff --git a/arch/i386/mm/boot_ioremap_32.c b/arch/x86/mm/boot_ioremap_32.c
similarity index 100%
rename from arch/i386/mm/boot_ioremap_32.c
rename to arch/x86/mm/boot_ioremap_32.c

diff --git a/arch/i386/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
similarity index 100%
rename from arch/i386/mm/discontig_32.c
rename to arch/x86/mm/discontig_32.c

diff --git a/arch/i386/mm/extable_32.c b/arch/x86/mm/extable_32.c
similarity index 100%
rename from arch/i386/mm/extable_32.c
rename to arch/x86/mm/extable_32.c

diff --git a/arch/i386/mm/fault_32.c b/arch/x86/mm/fault_32.c
similarity index 100%
rename from arch/i386/mm/fault_32.c
rename to arch/x86/mm/fault_32.c

diff --git a/arch/i386/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
similarity index 100%
rename from arch/i386/mm/highmem_32.c
rename to arch/x86/mm/highmem_32.c

diff --git a/arch/i386/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
similarity index 100%
rename from arch/i386/mm/hugetlbpage.c
rename to arch/x86/mm/hugetlbpage.c

diff --git a/arch/i386/mm/init_32.c b/arch/x86/mm/init_32.c
similarity index 100%
rename from arch/i386/mm/init_32.c
rename to arch/x86/mm/init_32.c

diff --git a/arch/i386/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c
similarity index 100%
rename from arch/i386/mm/ioremap_32.c
rename to arch/x86/mm/ioremap_32.c

diff --git a/arch/i386/mm/mmap_32.c b/arch/x86/mm/mmap_32.c
similarity index 100%
rename from arch/i386/mm/mmap_32.c
rename to arch/x86/mm/mmap_32.c

diff --git a/arch/i386/mm/pageattr_32.c b/arch/x86/mm/pageattr_32.c
similarity index 100%
rename from arch/i386/mm/pageattr_32.c
rename to arch/x86/mm/pageattr_32.c

diff --git a/arch/i386/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
similarity index 100%
rename from arch/i386/mm/pgtable_32.c
rename to arch/x86/mm/pgtable_32.c

diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
index 4042f8563a1699190d0fb026dfb5c15a29234d7e..7317648e6587c07e3765f4bc93b5226b44179605 100644 (file)
--- a/arch/x86_64/mm/Makefile
+++ b/arch/x86_64/mm/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/mm/Makefile_32
+include ${srctree}/arch/x86/mm/Makefile_32
 else
 include ${srctree}/arch/x86_64/mm/Makefile_64
 endif

diff --git a/arch/x86_64/mm/Makefile_64 b/arch/x86_64/mm/Makefile_64
index 2e209885fce60ae0ba013931936fcea2ef781c6a..5c2883cad11b17e5cd91f1762090facdd9dbea8d 100644 (file)
--- a/arch/x86_64/mm/Makefile_64
+++ b/arch/x86_64/mm/Makefile_64
@@ -8,4 +8,4 @@ obj-$(CONFIG_NUMA) += numa_64.o
 obj-$(CONFIG_K8_NUMA) += k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA) += srat_64.o
 
-hugetlbpage-y = ../../i386/mm/hugetlbpage.o
+hugetlbpage-y = ../../x86/mm/hugetlbpage.o