aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Kravetz <kravetz@us.ibm.com>2005-06-23 00:07:51 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 09:45:04 -0700
commit368a0a3afad08069b2679ecaff80fc18c10a6e2a (patch)
tree7fbb6691a56b31705f6c4bf809784ba9d4f5db18 /arch
parent785dcd44b60ec8ede76fed0af54333ab5f3e848c (diff)
[PATCH] ppc64: Kconfig memory models
This patch changes some of the default behavior in the ppc64 Kconfig file that was recently changed/added to 2.6.12-rc2-mm1 by Dave Hansen in preparation for SPARSEMEM. Patch allows the display of both FLAT and DISCONTIG models on pseries. As before, default is DISCONTIG for SMP and PSERIES and FLAT for others. Signed-off-by: Mike Kravetz <kravetz@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc64/Kconfig9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 87344f32423..011b5c0bf1d 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -199,9 +199,16 @@ config HMT
pSeries systems p620 and p660 have such a cpu type.
config ARCH_DISCONTIGMEM_ENABLE
- bool "Discontiguous Memory Support"
+ def_bool y
depends on SMP && PPC_PSERIES
+config ARCH_DISCONTIGMEM_DEFAULT
+ def_bool y
+ depends on ARCH_DISCONTIGMEM_ENABLE
+
+config ARCH_FLATMEM_ENABLE
+ def_bool y
+
source "mm/Kconfig"
config NUMA