aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody P Schafer <cody@linux.vnet.ibm.com>2013-07-03 18:01:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:27 -0400
commit3664033c56f211a3dcf28d9d68c604ed447d8d79 (patch)
tree90c575362c2e6491f1267358b00fd9f84da6dcee
parent737af4c0110fc69a81dc7464a74a4113f7645255 (diff)
mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch()
Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> Cc: Gilad Ben-Yossef <gilad@benyossef.com> Cc: KOSAKI Motohiro <kosaki.motohiro@gmail.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Pekka Enberg <penberg@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/page_alloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c7344d17660b..03a3f943d98e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4065,7 +4065,7 @@ static void pageset_update(struct per_cpu_pages *pcp, unsigned long high,
4065 pcp->batch = batch; 4065 pcp->batch = batch;
4066} 4066}
4067 4067
4068/* a companion to setup_pagelist_highmark() */ 4068/* a companion to pageset_set_high() */
4069static void pageset_set_batch(struct per_cpu_pageset *p, unsigned long batch) 4069static void pageset_set_batch(struct per_cpu_pageset *p, unsigned long batch)
4070{ 4070{
4071 pageset_update(&p->pcp, 6 * batch, max(1UL, 1 * batch)); 4071 pageset_update(&p->pcp, 6 * batch, max(1UL, 1 * batch));
@@ -4091,10 +4091,10 @@ static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch)
4091} 4091}
4092 4092
4093/* 4093/*
4094 * setup_pagelist_highmark() sets the high water mark for hot per_cpu_pagelist 4094 * pageset_set_high() sets the high water mark for hot per_cpu_pagelist
4095 * to the value high for the pageset p. 4095 * to the value high for the pageset p.
4096 */ 4096 */
4097static void setup_pagelist_highmark(struct per_cpu_pageset *p, 4097static void pageset_set_high(struct per_cpu_pageset *p,
4098 unsigned long high) 4098 unsigned long high)
4099{ 4099{
4100 unsigned long batch = max(1UL, high / 4); 4100 unsigned long batch = max(1UL, high / 4);
@@ -4110,7 +4110,7 @@ static void __meminit zone_pageset_init(struct zone *zone, int cpu)
4110 4110
4111 pageset_init(pcp); 4111 pageset_init(pcp);
4112 if (percpu_pagelist_fraction) 4112 if (percpu_pagelist_fraction)
4113 setup_pagelist_highmark(pcp, 4113 pageset_set_high(pcp,
4114 (zone->managed_pages / 4114 (zone->managed_pages /
4115 percpu_pagelist_fraction)); 4115 percpu_pagelist_fraction));
4116 else 4116 else
@@ -5599,8 +5599,8 @@ int percpu_pagelist_fraction_sysctl_handler(ctl_table *table, int write,
5599 unsigned long high; 5599 unsigned long high;
5600 high = zone->managed_pages / percpu_pagelist_fraction; 5600 high = zone->managed_pages / percpu_pagelist_fraction;
5601 for_each_possible_cpu(cpu) 5601 for_each_possible_cpu(cpu)
5602 setup_pagelist_highmark( 5602 pageset_set_high(per_cpu_ptr(zone->pageset, cpu),
5603 per_cpu_ptr(zone->pageset, cpu), high); 5603 high);
5604 } 5604 }
5605 mutex_unlock(&pcp_batch_high_lock); 5605 mutex_unlock(&pcp_batch_high_lock);
5606 return 0; 5606 return 0;