Merge remote-tracking branch 'percpu/for-next'

diff --git a/mm/percpu.c b/mm/percpu.c
index 8c8e08f3a692ecf614fabd537aa9dc4e00f42b21..0d10defe951e2e1ce7af63808c3af77d5f81d612 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1706,8 +1706,9 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
 
 out_free_areas:
        for (group = 0; group < ai->nr_groups; group++)
-               free_fn(areas[group],
-                       ai->groups[group].nr_units * ai->unit_size);
+               if (areas[group])
+                       free_fn(areas[group],
+                               ai->groups[group].nr_units * ai->unit_size);
 out_free:
        pcpu_free_alloc_info(ai);
        if (areas)