aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaowei Bai <bywxiaobai@163.com>2015-09-08 18:04:10 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-08 18:35:28 -0400
commit013110a73dcf970cb28c5b0a79f9eee577ea6aa2 (patch)
tree398a875ba2896297383814281b091faf47574a51
parentc9d13f5fc748a02cb5917a798f065681007342b9 (diff)
mm/page_alloc.c: fix a misleading comment
The comment says that the per-cpu batchsize and zone watermarks are determined by present_pages which is definitely wrong, they are both calculated from managed_pages. Fix it. Signed-off-by: Yaowei Bai <bywxiaobai@163.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/sysctl/vm.txt4
-rw-r--r--mm/page_alloc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 9c3f2f8054b5..a4482fceacec 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -349,7 +349,7 @@ zone[i]'s protection[j] is calculated by following expression.
349 349
350(i < j): 350(i < j):
351 zone[i]->protection[j] 351 zone[i]->protection[j]
352 = (total sums of present_pages from zone[i+1] to zone[j] on the node) 352 = (total sums of managed_pages from zone[i+1] to zone[j] on the node)
353 / lowmem_reserve_ratio[i]; 353 / lowmem_reserve_ratio[i];
354(i = j): 354(i = j):
355 (should not be protected. = 0; 355 (should not be protected. = 0;
@@ -360,7 +360,7 @@ The default values of lowmem_reserve_ratio[i] are
360 256 (if zone[i] means DMA or DMA32 zone) 360 256 (if zone[i] means DMA or DMA32 zone)
361 32 (others). 361 32 (others).
362As above expression, they are reciprocal number of ratio. 362As above expression, they are reciprocal number of ratio.
363256 means 1/256. # of protection pages becomes about "0.39%" of total present 363256 means 1/256. # of protection pages becomes about "0.39%" of total managed
364pages of higher zones on the node. 364pages of higher zones on the node.
365 365
366If you would like to protect more pages, smaller values are effective. 366If you would like to protect more pages, smaller values are effective.
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index bdaa0cf8fd41..59abb47b70ee 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6022,7 +6022,7 @@ void __init mem_init_print_info(const char *str)
6022 * set_dma_reserve - set the specified number of pages reserved in the first zone 6022 * set_dma_reserve - set the specified number of pages reserved in the first zone
6023 * @new_dma_reserve: The number of pages to mark reserved 6023 * @new_dma_reserve: The number of pages to mark reserved
6024 * 6024 *
6025 * The per-cpu batchsize and zone watermarks are determined by present_pages. 6025 * The per-cpu batchsize and zone watermarks are determined by managed_pages.
6026 * In the DMA zone, a significant percentage may be consumed by kernel image 6026 * In the DMA zone, a significant percentage may be consumed by kernel image
6027 * and other unfreeable allocations which can skew the watermarks badly. This 6027 * and other unfreeable allocations which can skew the watermarks badly. This
6028 * function may optionally be used to account for unfreeable pages in the 6028 * function may optionally be used to account for unfreeable pages in the