diff --git a/[refs] b/[refs] index 715ca0eea2a9..89fa75e66342 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e2b4043cc0a2c11abbe4fdff6dce3f81cff3e30 +refs/heads/master: ebe40c5c4c888f2cbfd9f0880a8bc072e6fc3a0d diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 17c988b678d1..c171f5bcf258 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/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