diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2008-09-24 04:29:08 +0000 |
|---|---|---|
| committer |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-07 14:26:20 +1100 |
| commit | ebe40c5c4c888f2cbfd9f0880a8bc072e6fc3a0d (patch) | |
| tree | 165f42619606c83fbc8b87016aa67e50448a7094 /arch/powerpc/Kconfig | |
| parent | powerpc: Fix 64-bit hibernation with 64k pages (diff) | |
| download | linux-dev-ebe40c5c4c888f2cbfd9f0880a8bc072e6fc3a0d.tar.xz linux-dev-ebe40c5c4c888f2cbfd9f0880a8bc072e6fc3a0d.zip | |
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>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 |
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 config FORCE_MAX_ZONEORDER int "Maximum zone order" + range 9 64 if PPC_64K_PAGES default "9" if PPC_64K_PAGES + range 13 64 if PPC64 && !PPC_64K_PAGES default "13" if PPC64 && !PPC_64K_PAGES + range 11 64 default "11" help The kernel memory allocator divides physically contiguous memory |