16 files changed, 4 insertions, 4 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 776d8dcf2340..cbdc14fddc3a 100644
--- 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
index 4042f8563a16..7317648e6587 100644
--- 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
index 362b4ad082de..362b4ad082de 100644
--- a/arch/i386/mm/Makefile_32
+++ b/arch/x86/mm/Makefile_32
diff --git a/arch/i386/mm/boot_ioremap_32.c b/arch/x86/mm/boot_ioremap_32.c
index 4de95a17a7d4..4de95a17a7d4 100644
--- a/arch/i386/mm/boot_ioremap_32.c
+++ b/arch/x86/mm/boot_ioremap_32.c
diff --git a/arch/i386/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 860e912a3fbb..860e912a3fbb 100644
--- a/arch/i386/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
diff --git a/arch/i386/mm/extable_32.c b/arch/x86/mm/extable_32.c
index 0ce4f22a2635..0ce4f22a2635 100644
--- a/arch/i386/mm/extable_32.c
+++ b/arch/x86/mm/extable_32.c
diff --git a/arch/i386/mm/fault_32.c b/arch/x86/mm/fault_32.c
index fcb38e7f3543..fcb38e7f3543 100644
--- a/arch/i386/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
diff --git a/arch/i386/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 1c3bf95f7356..1c3bf95f7356 100644
--- a/arch/i386/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 6c06d9c0488e..6c06d9c0488e 100644
--- a/arch/i386/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
diff --git a/arch/i386/mm/init_32.c b/arch/x86/mm/init_32.c
index 730a5b177b1f..730a5b177b1f 100644
--- a/arch/i386/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
diff --git a/arch/i386/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c
index 0b278315d737..0b278315d737 100644
--- a/arch/i386/mm/ioremap_32.c
+++ b/arch/x86/mm/ioremap_32.c
diff --git a/arch/i386/mm/mmap_32.c b/arch/x86/mm/mmap_32.c
index 552e08473755..552e08473755 100644
--- a/arch/i386/mm/mmap_32.c
+++ b/arch/x86/mm/mmap_32.c
diff --git a/arch/i386/mm/pageattr_32.c b/arch/x86/mm/pageattr_32.c
index 4241a74d16c8..4241a74d16c8 100644
--- a/arch/i386/mm/pageattr_32.c
+++ b/arch/x86/mm/pageattr_32.c
diff --git a/arch/i386/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index 01437c46baae..01437c46baae 100644
--- a/arch/i386/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
index 4042f8563a16..7317648e6587 100644
--- 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 2e209885fce6..5c2883cad11b 100644
--- 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