From f874108c126f4cd11e21ed83b93f7e9204272b3e Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Wed, 26 Mar 2008 08:35:32 +1100 Subject: [PATCH] --- yaml --- r: 91511 b: refs/heads/master c: 6ccf61f94fbac3e8715f2f938b27cdb3836c1f8c h: refs/heads/master i: 91509: 03056ceb8f6c7839f75499cc5c32e3893d1ad044 91507: e2871fe503949937d1c40ef49fb76c8d2b9b3158 91503: 0d70f12211fc7d46926c8f7a57a331259fcfbeae v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 41f08deb1b48..eac9fc56ef58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5d5d94aa54ba1f7691b79336b18804d4b0adf48 +refs/heads/master: 6ccf61f94fbac3e8715f2f938b27cdb3836c1f8c diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index f43d82dbc323..625342e1a733 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -211,14 +211,25 @@ source kernel/Kconfig.hz source kernel/Kconfig.preempt source "fs/Kconfig.binfmt" -# We optimistically allocate largepages from the VM, so make the limit -# large enough (16MB). This badly named config option is actually -# max order + 1 config FORCE_MAX_ZONEORDER - int - depends on PPC64 + int "Maximum zone order" default "9" if PPC_64K_PAGES - default "13" + default "13" if PPC64 + default "11" + help + The kernel memory allocator divides physically contiguous memory + blocks into "zones", where each zone is a power of two number of + pages. This option selects the largest power of two that the kernel + keeps in the memory allocator. If you need to allocate very large + blocks of physically contiguous memory, then you may need to + increase this value. + + This config option is actually maximum order plus one. For example, + a value of 11 means that the largest free memory block is 2^10 pages. + + The page size is not necessarily 4KB. For example, on 64-bit + systems, 64KB pages can be enabled via CONFIG_PPC_64K_PAGES. Keep + this in mind when choosing a value for this option. config HUGETLB_PAGE_SIZE_VARIABLE bool