diff --git a/[refs] b/[refs]
index 0004e0abbcb1..54cb95399318 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 359fd6de61fc8777316709fb79047c480b3eae0d
+refs/heads/master: 82606d5738f29d3026159ebabba687facd25276e
diff --git a/trunk/arch/i386/mm/Makefile b/trunk/arch/i386/mm/Makefile
index 362b4ad082de..4042f8563a16 100644
--- a/trunk/arch/i386/mm/Makefile
+++ b/trunk/arch/i386/mm/Makefile
@@ -1,10 +1,5 @@
-#
-# Makefile for the linux i386-specific parts of the memory manager.
-#
-
-obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap_32.o extable_32.o pageattr_32.o mmap_32.o
-
-obj-$(CONFIG_NUMA) += discontig_32.o
-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_HIGHMEM) += highmem_32.o
-obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/mm/Makefile_32
+else
+include ${srctree}/arch/x86_64/mm/Makefile_64
+endif
diff --git a/trunk/arch/i386/mm/Makefile_32 b/trunk/arch/i386/mm/Makefile_32
new file mode 100644
index 000000000000..362b4ad082de
--- /dev/null
+++ b/trunk/arch/i386/mm/Makefile_32
@@ -0,0 +1,10 @@
+#
+# Makefile for the linux i386-specific parts of the memory manager.
+#
+
+obj-y	:= init_32.o pgtable_32.o fault_32.o ioremap_32.o extable_32.o pageattr_32.o mmap_32.o
+
+obj-$(CONFIG_NUMA) += discontig_32.o
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
+obj-$(CONFIG_HIGHMEM) += highmem_32.o
+obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o