mm: Remove default DISCONTIGMEM_MANUAL
diff mbox series

Message ID 20210312141208.3465520-1-geert@linux-m68k.org
State Accepted
Commit d68d015a7e5e3d45624960420e32bd52a937447a
Headers show
Series
  • mm: Remove default DISCONTIGMEM_MANUAL
Related show

Commit Message

Geert Uytterhoeven March 12, 2021, 2:12 p.m. UTC
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.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
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(-)

Comments

Mike Rapoport March 12, 2021, 7:48 p.m. UTC | #1
Hello Geert,

On Fri, Mar 12, 2021 at 03:12:08PM +0100, Geert Uytterhoeven wrote:
> 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.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>

> ---
> 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.

> ---
>  mm/Kconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/mm/Kconfig b/mm/Kconfig
> index 24c045b24b95069b..579254f10fb1bac6 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
> -- 
> 2.25.1
>
David Hildenbrand March 17, 2021, 1:22 p.m. UTC | #2
On 12.03.21 15:12, Geert Uytterhoeven wrote:
> 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.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> 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(-)
> 
> diff --git a/mm/Kconfig b/mm/Kconfig
> index 24c045b24b95069b..579254f10fb1bac6 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
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

Patch
diff mbox series

diff --git a/mm/Kconfig b/mm/Kconfig
index 24c045b24b95069b..579254f10fb1bac6 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