Commit e10821b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_build_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 Kconfig fix from Borislav Petkov:

 - Correct Kconfig symbol visibility on x86

* tag 'x86_build_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/Kconfig: Select ARCH_SELECT_MEMORY_MODEL only if FLATMEM and SPARSEMEM are possible
parents 22687350 4eda2bc3

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,7 @@ config ARCH_SPARSEMEM_DEFAULT 


config ARCH_SELECT_MEMORY_MODEL

	def_bool y

	depends on ARCH_SPARSEMEM_ENABLE

	depends on ARCH_SPARSEMEM_ENABLE && ARCH_FLATMEM_ENABLE



config ARCH_MEMORY_PROBE

	bool "Enable sysfs memory/probe interface"