summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2021-04-30 09:01:33 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-30 21:20:43 +0300
commitd68d015a7e5e3d45624960420e32bd52a937447a (patch)
treeafcb5fc237c661861efcb8f54fd280546abe6f4d /mm
parenta1394bddf9b60e96d075d94b71a8857696598186 (diff)
downloadlinux-d68d015a7e5e3d45624960420e32bd52a937447a.tar.xz
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>
Diffstat (limited to 'mm')
-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