Re: Finding what change broke ARM

[Andy Whitcroft <apw@shadowen.org>]

> Well, this fixes the problem, but I doubt people will like it.

This looks like a problem with the way the configuration options where
changed to allow more than two memory models for SPARSMEM.  I think the
right fix is the patch below.  Russell could you try this one instead.
Dave, you did most of the work on the configuration side could you look
this over (assuming it works!).

-apw

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
 Kconfig |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)
diff -upN reference/arch/arm/Kconfig current/arch/arm/Kconfig
--- reference/arch/arm/Kconfig
+++ current/arch/arm/Kconfig
@@ -161,7 +161,6 @@ config ARCH_RPC
 config ARCH_SA1100
 	bool "SA1100-based"
 	select ISA
-	select DISCONTIGMEM
 
 config ARCH_S3C2410
 	bool "Samsung S3C2410"
@@ -345,7 +344,7 @@ config PREEMPT
 
 config ARCH_DISCONTIGMEM_ENABLE
 	bool
-	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
+	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) || ARCH_SA1100
 	help
 	  Say Y to support efficient handling of discontiguous physical memory,
 	  for architectures which are either NUMA (Non-Uniform Memory Access)