The following commit has been merged into the x86/build branch of tip: Commit-ID: 4eda2bc3431ebe5c8361580877a4666d10ea28a7 Gitweb: https://git.kernel.org/tip/4eda2bc3431ebe5c8361580877a4666d10ea28a7 Author: David Hildenbrand <david@xxxxxxxxxx> AuthorDate: Wed, 29 Sep 2021 16:43:21 +02:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Sun, 23 Jan 2022 20:52:16 +01:00 x86/Kconfig: Select ARCH_SELECT_MEMORY_MODEL only if FLATMEM and SPARSEMEM are possible x86-64 supports only CONFIG_SPARSEMEM; there is nothing users can select. So enable the memory model selection (via CONFIG_ARCH_SELECT_MEMORY_MODEL) only if both, SPARSEMEM and FLATMEM are possible, which isn't the case on x86-64. Signed-off-by: David Hildenbrand <david@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lore.kernel.org/r/20210929144321.50411-1-david@xxxxxxxxxx --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ebe8fc7..a7e0bf4 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1637,7 +1637,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"
|