Subject: [PATCH] powerpc ppc32 clean up available memory models

From: Andy Whitcroft <[email-masked]>
Date: Tue, 29 Nov 2005 19:20:55 +0000

Ok, attempt #2 at cleaning up the memory models for powerpc/ppc32.
Made it very explicit which combinations require FLATMEM and left
the defaults alone for SPARSEMEM.  Seems to do what I expect.

Comments.

-apw

=== 8< ===
powerpc: ppc32 clean up available memory models

Clean up the currently available memory models for ppc32 under
the powerpc architecture.  We need FLATMEM for ppc32 enable it.
SPARSEMEM is not parameterised for ppc32 so disable that.  Take this
opportunity to clean up white space for FLATMEM_ENABLE.

Against 2.6.15-rc3 with Anton's flatmem disable patch.

Signed-off-by: Andy Whitcroft <[email-masked]>
---
diff -upN reference/arch/powerpc/Kconfig current/arch/powerpc/Kconfig
--- reference/arch/powerpc/Kconfig
+++ current/arch/powerpc/Kconfig
@@ -578,11 +578,12 @@ config ARCH_SELECT_MEMORY_MODEL
 	depends on PPC64
 
 config ARCH_FLATMEM_ENABLE
-       def_bool y
-       depends on PPC64 && !NUMA
+	def_bool y
+	depends on (PPC64 && !NUMA) || PPC32
 
 config ARCH_SPARSEMEM_ENABLE
 	def_bool y
+	depends on PPC64
 
 config ARCH_SPARSEMEM_DEFAULT
 	def_bool y