Commit 214496cb authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

ia64: make SPARSEMEM default and disable DISCONTIGMEM 

SPARSEMEM memory model suitable for systems with large holes in their
phyiscal memory layout. With SPARSEMEM_VMEMMAP enabled it provides
pfn_to_page() and page_to_pfn() as fast as FLATMEM.

Make it the default memory model for IA-64 and disable DISCONTIGMEM which
is considered obsolete for quite some time.

Link: https://lkml.kernel.org/r/20201101170454.9567-8-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Meelis Roos <mroos@linux.ee>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea34f78f

arch/ia64/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ config ARCH_SELECT_MEMORY_MODEL 


config ARCH_DISCONTIGMEM_ENABLE

	def_bool y

	depends on BROKEN

	help

	  Say Y to support efficient handling of discontiguous physical memory,

	  for architectures which are either NUMA (Non-Uniform Memory Access)
@@ -299,12 +300,11 @@ config ARCH_FLATMEM_ENABLE 


config ARCH_SPARSEMEM_ENABLE

	def_bool y

	depends on ARCH_DISCONTIGMEM_ENABLE

	select SPARSEMEM_VMEMMAP_ENABLE



config ARCH_DISCONTIGMEM_DEFAULT

config ARCH_SPARSEMEM_DEFAULT

	def_bool y

	depends on ARCH_DISCONTIGMEM_ENABLE

	depends on ARCH_SPARSEMEM_ENABLE



config NUMA

	bool "NUMA support"