From 368a0a3afad08069b2679ecaff80fc18c10a6e2a Mon Sep 17 00:00:00 2001 From: Mike Kravetz Date: Thu, 23 Jun 2005 00:07:51 -0700 Subject: [PATCH] [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc64/Kconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index 87344f324233..011b5c0bf1d0 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 -- 2.30.2