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

Commit 3b16651f authored by Tejun Heo's avatar Tejun Heo
Browse files

x86: Clean up memory model related configs in arch/x86/Kconfig 



* Remove bogus dependency on ARCH_SELECT_MEMORY_MODEL from
  ARCH_FLATMEM_ENABLE.  ENABLE configs don't interfere with
  SELECT_MEMORY_MODEL.  They just need to indicate whether the
  specific memory model is supported.

* Relocate HAVE_ARCH_ALLOC_REMAP, ARCH_PROC_KCORE_TEXT and
  ARCH_SPARSEMEM_DEFAULT so that memory model related configs are
  together in consistent order.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
parent 05293608

arch/x86/Kconfig

+13 −13
Original line number Diff line number Diff line
@@ -1223,6 +1223,10 @@ config HAVE_ARCH_BOOTMEM 
	def_bool y

	depends on X86_32 && NUMA



config HAVE_ARCH_ALLOC_REMAP

	def_bool y

	depends on X86_32 && NUMA



config ARCH_HAVE_MEMORY_PRESENT

	def_bool y

	depends on X86_32 && DISCONTIGMEM
@@ -1231,13 +1235,9 @@ config NEED_NODE_MEMMAP_SIZE 
	def_bool y

	depends on X86_32 && (DISCONTIGMEM || SPARSEMEM)



config HAVE_ARCH_ALLOC_REMAP

	def_bool y

	depends on X86_32 && NUMA



config ARCH_FLATMEM_ENABLE

	def_bool y

	depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && !NUMA

	depends on X86_32 && !NUMA



config ARCH_DISCONTIGMEM_ENABLE

	def_bool y
@@ -1247,20 +1247,16 @@ config ARCH_DISCONTIGMEM_DEFAULT 
	def_bool y

	depends on NUMA && X86_32



config ARCH_PROC_KCORE_TEXT

	def_bool y

	depends on X86_64 && PROC_KCORE



config ARCH_SPARSEMEM_DEFAULT

	def_bool y

	depends on X86_64



config ARCH_SPARSEMEM_ENABLE

	def_bool y

	depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD

	select SPARSEMEM_STATIC if X86_32

	select SPARSEMEM_VMEMMAP_ENABLE if X86_64



config ARCH_SPARSEMEM_DEFAULT

	def_bool y

	depends on X86_64



config ARCH_SELECT_MEMORY_MODEL

	def_bool y

	depends on ARCH_SPARSEMEM_ENABLE
@@ -1269,6 +1265,10 @@ config ARCH_MEMORY_PROBE 
	def_bool X86_64

	depends on MEMORY_HOTPLUG



config ARCH_PROC_KCORE_TEXT

	def_bool y

	depends on X86_64 && PROC_KCORE



config ILLEGAL_POINTER_VALUE

       hex

       default 0 if X86_32