[PATCH] ppc64 memory model depends on NUMA

Currently when we first select memory model (FLAT, DISCONTIG, SPARSE) then
select whether the machine is NUMA.  However NUMA systems may not be FLAT.
This constraint it not honoured and we may configure a NUMA/FLAT system.

Reorder the configuration such that we choose NUMA first which allows us to
only list the memory models which are valid.  We now default NUMA for known
NUMA systems.  Note that this new order also matches that used in x86.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 9 insertions, 15 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c71ddc0c191a..967ecf92d6a7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -538,6 +538,11 @@ config IRQ_ALL_CPUS
 
 source "arch/powerpc/platforms/pseries/Kconfig"
 
+config NUMA
+        bool "NUMA support"
+        depends on PPC64
+        default y if SMP && PPC_PSERIES
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on PPC64
@@ -554,10 +559,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
 
-config ARCH_FLATMEM_ENABLE
-        def_bool y
-        depends on PPC64
-
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
@@ -581,10 +582,6 @@ config NODES_SPAN_OTHER_NODES
         def_bool y
         depends on NEED_MULTIPLE_NODES
 
-config NUMA
-        bool "NUMA support"
-        default y if DISCONTIGMEM || SPARSEMEM
-
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
         depends on PPC64 && SMP
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index b889277ab7de..42677cc96508 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -248,6 +248,10 @@ config HMT
           This option enables hardware multithreading on RS64 cpus.
           pSeries systems p620 and p660 have such a cpu type.
 
+config NUMA
+        bool "NUMA support"
+        default y if SMP && PPC_PSERIES
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
 
@@ -263,9 +267,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
 
-config ARCH_FLATMEM_ENABLE
-        def_bool y
-
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
@@ -288,10 +289,6 @@ config NODES_SPAN_OTHER_NODES
         def_bool y
         depends on NEED_MULTIPLE_NODES
 
-config NUMA
-        bool "NUMA support"
-        default y if DISCONTIGMEM || SPARSEMEM
-
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
         depends on SMP