mm/page_alloc: in zone_pcp_update(), uze zone_pageset_init()

Previously, zone_pcp_update() called pageset_set_batch() directly,
essentially assuming that percpu_pagelist_fraction == 0.

Correct this by calling zone_pageset_init(), which chooses the
appropriate ->batch and ->high calculations.

Signed-off-by: Cody P Schafer <[email protected]>
Cc: Gilad Ben-Yossef <[email protected]>
Cc: KOSAKI Motohiro <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Pekka Enberg <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ee6fe7faabadb955c76df20750b07fec7e15ba0a..c7344d17660b30576005bc5a28031673b5ab244e 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6098,11 +6098,9 @@ void free_contig_range(unsigned long pfn, unsigned nr_pages)
 void __meminit zone_pcp_update(struct zone *zone)
 {
        unsigned cpu;
-       unsigned long batch;
        mutex_lock(&pcp_batch_high_lock);
-       batch = zone_batchsize(zone);
        for_each_possible_cpu(cpu)
-               pageset_set_batch(per_cpu_ptr(zone->pageset, cpu), batch);
+               zone_pageset_init(zone, cpu);
        mutex_unlock(&pcp_batch_high_lock);
 }
 #endif