mm/page_alloc: factor zone_pageset_init() out of setup_zone_pageset()

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 2793ce50f316d74be67c370c7c5670ba79c44ea5..ee6fe7faabadb955c76df20750b07fec7e15ba0a 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4104,22 +4104,25 @@ static void setup_pagelist_highmark(struct per_cpu_pageset *p,
        pageset_update(&p->pcp, high, batch);
 }
 
+static void __meminit zone_pageset_init(struct zone *zone, int cpu)
+{
+       struct per_cpu_pageset *pcp = per_cpu_ptr(zone->pageset, cpu);
+
+       pageset_init(pcp);
+       if (percpu_pagelist_fraction)
+               setup_pagelist_highmark(pcp,
+                       (zone->managed_pages /
+                               percpu_pagelist_fraction));
+       else
+               pageset_set_batch(pcp, zone_batchsize(zone));
+}
+
 static void __meminit setup_zone_pageset(struct zone *zone)
 {
        int cpu;
-
        zone->pageset = alloc_percpu(struct per_cpu_pageset);
-
-       for_each_possible_cpu(cpu) {
-               struct per_cpu_pageset *pcp = per_cpu_ptr(zone->pageset, cpu);
-
-               setup_pageset(pcp, zone_batchsize(zone));
-
-               if (percpu_pagelist_fraction)
-                       setup_pagelist_highmark(pcp,
-                               (zone->managed_pages /
-                                       percpu_pagelist_fraction));
-       }
+       for_each_possible_cpu(cpu)
+               zone_pageset_init(zone, cpu);
 }
 
 /*