Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2596e0fa authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

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: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ee7ae7a1

arch/x86/mm/Makefile

+12 −2
Original line number Diff line number Diff line 
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

arch/x86/mm/Makefile_32

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
#

# Makefile for the linux i386-specific parts of the memory manager.

#



obj-y	:= init_32.o pgtable_32.o fault.o ioremap.o extable.o pageattr.o mmap.o



obj-$(CONFIG_NUMA) += discontig_32.o

obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o

obj-$(CONFIG_HIGHMEM) += highmem_32.o

arch/x86/mm/Makefile_64

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
#

# Makefile for the linux x86_64-specific parts of the memory manager.

#



obj-y	 := init_64.o fault.o ioremap.o extable.o pageattr.o mmap.o

obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o

obj-$(CONFIG_NUMA) += numa_64.o

obj-$(CONFIG_K8_NUMA) += k8topology_64.o

obj-$(CONFIG_ACPI_NUMA) += srat_64.o