aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/percpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index aa121cef76de..b9691d946fdc 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1851,7 +1851,7 @@ struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
1851 __alignof__(ai->groups[0].cpu_map[0])); 1851 __alignof__(ai->groups[0].cpu_map[0]));
1852 ai_size = base_size + nr_units * sizeof(ai->groups[0].cpu_map[0]); 1852 ai_size = base_size + nr_units * sizeof(ai->groups[0].cpu_map[0]);
1853 1853
1854 ptr = memblock_virt_alloc_nopanic(PFN_ALIGN(ai_size), 0); 1854 ptr = memblock_virt_alloc_nopanic(PFN_ALIGN(ai_size), PAGE_SIZE);
1855 if (!ptr) 1855 if (!ptr)
1856 return NULL; 1856 return NULL;
1857 ai = ptr; 1857 ai = ptr;
@@ -2714,6 +2714,7 @@ void __init setup_per_cpu_areas(void)
2714 2714
2715 if (pcpu_setup_first_chunk(ai, fc) < 0) 2715 if (pcpu_setup_first_chunk(ai, fc) < 0)
2716 panic("Failed to initialize percpu areas."); 2716 panic("Failed to initialize percpu areas.");
2717 pcpu_free_alloc_info(ai);
2717} 2718}
2718 2719
2719#endif /* CONFIG_SMP */ 2720#endif /* CONFIG_SMP */