[PATCH] Fix sparsemem configuration

[PATCH] Fix sparsemem configuration

[Russell King]

Currently, sparsemem is only available if EXPERIMENTAL is enabled.
However, it hasn't ever been marked experimental.

It's been about four years since sparsemem was merged, and we have
platforms which depend on it; allow architectures to decide whether
sparsemem should be the default memory model.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--
 mm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/Kconfig b/mm/Kconfig
index 2477607..95b2965 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -67,7 +67,7 @@ config DISCONTIGMEM
 
 config SPARSEMEM
 	def_bool y
-	depends on SPARSEMEM_MANUAL
+	depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL
 
 config FLATMEM
 	def_bool y

Re: [PATCH] Fix sparsemem configuration

[Andrew Morton]

On Mon, 5 Oct 2009 16:05:30 +0100 Russell King <rmk+lkml@arm.linux.org.uk> wrote:

> Currently, sparsemem is only available if EXPERIMENTAL is enabled.
> However, it hasn't ever been marked experimental.
> 
> It's been about four years since sparsemem was merged, and we have
> platforms which depend on it; allow architectures to decide whether
> sparsemem should be the default memory model.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> --
>  mm/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/mm/Kconfig b/mm/Kconfig
> index 2477607..95b2965 100644
> --- a/mm/Kconfig
> +++ b/mm/Kconfig
> @@ -67,7 +67,7 @@ config DISCONTIGMEM
>  
>  config SPARSEMEM
>  	def_bool y
> -	depends on SPARSEMEM_MANUAL
> +	depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL
>  
>  config FLATMEM
>  	def_bool y

Can you suggest which kernel version(s) we should merge this into?  I'm
struggling.

Ta.

Re: [PATCH] Fix sparsemem configuration

[Russell King]

On Tue, Oct 13, 2009 at 07:49:50PM -0700, Andrew Morton wrote:
> On Mon, 5 Oct 2009 16:05:30 +0100 Russell King <rmk+lkml@arm.linux.org.uk> wrote:
> 
> > Currently, sparsemem is only available if EXPERIMENTAL is enabled.
> > However, it hasn't ever been marked experimental.
> > 
> > It's been about four years since sparsemem was merged, and we have
> > platforms which depend on it; allow architectures to decide whether
> > sparsemem should be the default memory model.
> > 
> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > --
> >  mm/Kconfig |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/mm/Kconfig b/mm/Kconfig
> > index 2477607..95b2965 100644
> > --- a/mm/Kconfig
> > +++ b/mm/Kconfig
> > @@ -67,7 +67,7 @@ config DISCONTIGMEM
> >  
> >  config SPARSEMEM
> >  	def_bool y
> > -	depends on SPARSEMEM_MANUAL
> > +	depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL
> >  
> >  config FLATMEM
> >  	def_bool y
> 
> Can you suggest which kernel version(s) we should merge this into?  I'm
> struggling.

I don't see any reason not to merge it into the current -rc.  Not sure
about -stable since there hasn't been a bug report against the machines
which currently use sparsemem.  That's not to say that people aren't
using it - they probably believe CONFIG_EXPERIMENTAL needs to be set as
per the machine's defconfig.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of: