aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-24 00:29:08 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-06 23:26:20 -0400
commitebe40c5c4c888f2cbfd9f0880a8bc072e6fc3a0d (patch)
tree165f42619606c83fbc8b87016aa67e50448a7094
parent2e2b4043cc0a2c11abbe4fdff6dce3f81cff3e30 (diff)
powerpc: Enforce sane MAX_ORDER
powerpc uses CONFIG_FORCE_MAX_ZONEORDER, and some things depend on it being at least 10 when 64k pages are not configured (notably the dart iommu code with CONFIG_PM). The defaults are fine, but when going from a 64K pages config to one without 64K pages, MAX_ORDER stays at 9 which is too low for 4K pages. This patch makes the Kconfig enforce at least the defaults. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 17c988b678d1..c171f5bcf258 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -415,8 +415,11 @@ config PPC_64K_PAGES
415 415
416config FORCE_MAX_ZONEORDER 416config FORCE_MAX_ZONEORDER
417 int "Maximum zone order" 417 int "Maximum zone order"
418 range 9 64 if PPC_64K_PAGES
418 default "9" if PPC_64K_PAGES 419 default "9" if PPC_64K_PAGES
420 range 13 64 if PPC64 && !PPC_64K_PAGES
419 default "13" if PPC64 && !PPC_64K_PAGES 421 default "13" if PPC64 && !PPC_64K_PAGES
422 range 11 64
420 default "11" 423 default "11"
421 help 424 help
422 The kernel memory allocator divides physically contiguous memory 425 The kernel memory allocator divides physically contiguous memory