x86: unify arch/x86/mm/Makefile

Unify arch/x86/mm/Makefile between 32 and 64 bits.

All configuration variables that are protected by Kconfig constraints
have been put in the common part of the Makefile; however, the NUMA
files are totally different between 32 and 64 bits and are handled via
an ifdef.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 12 insertions, 2 deletions

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 983291096848..8e81660604bc 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,5 +1,15 @@
+obj-y   :=  init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o
+
+obj-$(CONFIG_X86_32)            += pgtable_32.o
+
+obj-$(CONFIG_HUGETLB_PAGE)      += hugetlbpage.o
+
+obj-$(CONFIG_HIGHMEM)           += highmem_32.o
+
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/mm/Makefile_32
+obj-$(CONFIG_NUMA)              += discontig_32.o
 else
-include ${srctree}/arch/x86/mm/Makefile_64
+obj-$(CONFIG_NUMA)              += numa_64.o
+obj-$(CONFIG_K8_NUMA)           += k8topology_64.o
+obj-$(CONFIG_ACPI_NUMA)         += srat_64.o
 endif