Skip to contentSkip to conversation

mm: Remove default DISCONTIGMEM_MANUAL

PATCH Applied Geert Uytterhoeven 3 participants 3 messages Mar 12, 2021 – Mar 17, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm: 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.

---
DISCONTIGMEM_MANUAL depends on ARCH_DISCONTIGMEM_ENABLE, which in turns depends on BROKEN, so probably all discontig memory support can be removed, too?

---
 mm/Kconfig | 1 -
 1 file changed, 1 deletion(-)
mm/Kconfig +0 -1
index 24c045b24b95069b..579254f10fb1bac6 100644
@@ -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
Signature · 1 line
2.25.1
reviewer Reviewed-by on v1 1/1
#1 lore raw

Hello Geert,

Quoted 5 lines · Geert Uytterhoeven

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.

Quoted 4 lines

---
DISCONTIGMEM_MANUAL depends on ARCH_DISCONTIGMEM_ENABLE, which in turns depends on BROKEN, so probably all discontig memory support can be removed, too?

I'm planning to remove DISCONTIGMEM entirely after 2 or 3 releases to let the dust settle a bit after the last users of DISCONTIGMEM were switched to other memory models.

Quoted 19 lines
---
 mm/Kconfig | 1 -
 1 file changed, 1 deletion(-)
mm/Kconfig +0 -1
index 24c045b24b95069b..579254f10fb1bac6 100644
@@ -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
Signature · 1 line
2.25.1
Signature · 2 lines
Sincerely yours,
Mike.
Reviewed-by on v1 1/1
#2 lore raw
In reply to Geert Uytterhoeven
Quoted 19 lines · Geert Uytterhoeven

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.

---
DISCONTIGMEM_MANUAL depends on ARCH_DISCONTIGMEM_ENABLE, which in turns depends on BROKEN, so probably all discontig memory support can be removed, too?

---
  mm/Kconfig | 1 -
  1 file changed, 1 deletion(-)
mm/Kconfig +0 -0
index 24c045b24b95069b..579254f10fb1bac6 100644

mm/Kconfig config SELECT_MEMORY_MODEL · line 14

Quoted 7 lines
mm/Kconfig +0 -1
@@ -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
Signature · 3 lines
Thanks,

David / dhildenb