---

yaml
---
r: 91511
b: refs/heads/master
c: 6ccf61f
h: refs/heads/master
i:
  91509: 03056ce
  91507: e2871fe
  91503: 0d70f12
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5d5d94aa54ba1f7691b79336b18804d4b0adf48
+refs/heads/master: 6ccf61f94fbac3e8715f2f938b27cdb3836c1f8c

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