Skip to contentSkip to conversation

Fix sparsemem configuration

PATCH In review Russell King 2 participants 3 messages Oct 5, 2009 – Oct 14, 2009

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

PATCH 1/1 Fix sparsemem configuration

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.

--

 mm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/Kconfig +1 -1
index 2477607..95b2965 100644
@@ -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
maintainer
#1 lore raw
Quoted 17 lines · On Mon, 5 Oct 2009 16:05:30 +0100 Russell King <[email protected]>…

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.

--

 mm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/Kconfig +0 -0
index 2477607..95b2965 100644

mm/Kconfig config DISCONTIGMEM · line 73

Quoted 8 lines
mm/Kconfig +1 -1
@@ -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.

#2 lore raw
Quoted 25 lines · Andrew Morton
Quoted 23 lines · On Mon, 5 Oct 2009 16:05:30 +0100 Russell King <[email protected]>…

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.

--

 mm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/Kconfig +1 -1
index 2477607..95b2965 100644
@@ -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
 
Quoted 5 lines

mm/Kconfig config DISCONTIGMEM · line 73

Quoted 2 lines
mm/Kconfig +0 -0
 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.

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