From: Nicolas Pitre Date: Tue, 3 Oct 2017 22:29:49 +0000 (-0400) Subject: percpu: don't forget to free the temporary struct pcpu_alloc_info X-Git-Tag: v4.15-rc1~98^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=438a506180;p=thirdparty%2Fkernel%2Flinux.git percpu: don't forget to free the temporary struct pcpu_alloc_info Unlike the SMP case, the !SMP case does not free the memory for struct pcpu_alloc_info allocated in setup_per_cpu_areas(). And to give it a chance of being reused by the page allocator later, align it to a page boundary just like its size. Signed-off-by: Nicolas Pitre Acked-by: Dennis Zhou Signed-off-by: Tejun Heo --- diff --git a/mm/percpu.c b/mm/percpu.c index aa121cef76de3..b9691d946fdc9 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, __alignof__(ai->groups[0].cpu_map[0])); ai_size = base_size + nr_units * sizeof(ai->groups[0].cpu_map[0]); - ptr = memblock_virt_alloc_nopanic(PFN_ALIGN(ai_size), 0); + ptr = memblock_virt_alloc_nopanic(PFN_ALIGN(ai_size), PAGE_SIZE); if (!ptr) return NULL; ai = ptr; @@ -2714,6 +2714,7 @@ void __init setup_per_cpu_areas(void) if (pcpu_setup_first_chunk(ai, fc) < 0) panic("Failed to initialize percpu areas."); + pcpu_free_alloc_info(ai); } #endif /* CONFIG_SMP */