From 431732651cc16caebcd334b7b7476bfe0c4a2903 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Sun, 23 Feb 2020 11:43:22 +0200 Subject: x86/mm: Drop deprecated DISCONTIGMEM support for 32-bit The DISCONTIGMEM support was marked as deprecated in v5.2 and since there were no complaints about it for almost 5 releases it can be completely removed. Signed-off-by: Mike Rapoport Signed-off-by: Borislav Petkov Acked-by: Dave Hansen Link: https://lkml.kernel.org/r/20200223094322.15206-1-rppt@kernel.org --- arch/x86/Kconfig | 9 --------- 1 file changed, 9 deletions(-) (limited to 'arch/x86/Kconfig') diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1d6104ea8af0..f0aa19469d4b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1610,19 +1610,10 @@ config NODES_SHIFT Specify the maximum number of NUMA Nodes available on the target system. Increases memory reserved to accommodate various tables. -config ARCH_HAVE_MEMORY_PRESENT - def_bool y - depends on X86_32 && DISCONTIGMEM - config ARCH_FLATMEM_ENABLE def_bool y depends on X86_32 && !NUMA -config ARCH_DISCONTIGMEM_ENABLE - def_bool n - depends on NUMA && X86_32 - depends on BROKEN - config ARCH_SPARSEMEM_ENABLE def_bool y depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD -- cgit v1.2.3