From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri, 30 Apr 2021 06:01:33 +0000 (-0700)
Subject: mm/Kconfig: remove default DISCONTIGMEM_MANUAL
X-Git-Tag: accepted/tizen/unified/20230118.172025~7324^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d68d015a7e5e3d45624960420e32bd52a937447a;p=platform%2Fkernel%2Flinux-rpi.git

mm/Kconfig: remove default DISCONTIGMEM_MANUAL

Commit 214496cb18700fd7 ("ia64: make SPARSEMEM default and disable
DISCONTIGMEM") removed the last enabler of ARCH_DISCONTIGMEM_DEFAULT,
hence the memory model can no longer default to DISCONTIGMEM_MANUAL.

Link: https://lkml.kernel.org/r/20210312141208.3465520-1-geert@linux-m68k.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/Kconfig b/mm/Kconfig
index 8a27c7c9..3636da2 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -9,7 +9,6 @@ config SELECT_MEMORY_MODEL
 choice
 	prompt "Memory model"
 	depends on SELECT_MEMORY_MODEL
-	default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
 	default SPARSEMEM_MANUAL if ARCH_SPARSEMEM_DEFAULT
 	default FLATMEM_MANUAL
 	help