aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <[email protected]>2021-04-29 23:01:33 -0700
committerLinus Torvalds <[email protected]>2021-04-30 11:20:43 -0700
commitd68d015a7e5e3d45624960420e32bd52a937447a (patch)
treeafcb5fc237c661861efcb8f54fd280546abe6f4d
parenta1394bddf9b60e96d075d94b71a8857696598186 (diff)
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/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Mike Rapoport <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--mm/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 8a27c7c91428..3636da27c385 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