Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 368a0a3a authored by Mike Kravetz's avatar Mike Kravetz Committed by Linus Torvalds
Browse files

[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: default avatarMike Kravetz <kravetz@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 785dcd44
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -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