Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3664033c authored by Cody P Schafer's avatar Cody P Schafer Committed by Linus Torvalds
Browse files

mm/page_alloc: rename setup_pagelist_highmark() to match naming of pageset_set_batch() 



Signed-off-by: default avatarCody 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 737af4c0

mm/page_alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -4065,7 +4065,7 @@ static void pageset_update(struct per_cpu_pages *pcp, unsigned long high, 
	pcp->batch = batch;

}



/* a companion to setup_pagelist_highmark() */

/* a companion to pageset_set_high() */

static void pageset_set_batch(struct per_cpu_pageset *p, unsigned long batch)

{

	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) 
}



/*

 * setup_pagelist_highmark() sets the high water mark for hot per_cpu_pagelist

 * pageset_set_high() sets the high water mark for hot per_cpu_pagelist

 * to the value high for the pageset p.

 */

static void setup_pagelist_highmark(struct per_cpu_pageset *p,

static void pageset_set_high(struct per_cpu_pageset *p,

				unsigned long high)

{

	unsigned long batch = max(1UL, high / 4);
@@ -4110,7 +4110,7 @@ static void __meminit zone_pageset_init(struct zone *zone, int cpu) 


	pageset_init(pcp);

	if (percpu_pagelist_fraction)

		setup_pagelist_highmark(pcp,

		pageset_set_high(pcp,

			(zone->managed_pages /

				percpu_pagelist_fraction));

	else
@@ -5599,8 +5599,8 @@ int percpu_pagelist_fraction_sysctl_handler(ctl_table *table, int write, 
		unsigned long  high;

		high = zone->managed_pages / percpu_pagelist_fraction;

		for_each_possible_cpu(cpu)

			setup_pagelist_highmark(

					per_cpu_ptr(zone->pageset, cpu), high);

			pageset_set_high(per_cpu_ptr(zone->pageset, cpu),

					 high);

	}

	mutex_unlock(&pcp_batch_high_lock);

	return 0;