diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2017-10-04 00:29:49 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-10-04 15:53:32 +0200 |
| commit | 438a50618095061920d3a30d4c5ca1ef2e0ff860 (patch) | |
| tree | 71fd9e344473b605be6c9eac1cc6dab957dca3d2 | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-438a50618095061920d3a30d4c5ca1ef2e0ff860.tar.xz linux-438a50618095061920d3a30d4c5ca1ef2e0ff860.zip | |
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 <nico@linaro.org>
Acked-by: Dennis Zhou <dennisszhou@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | mm/percpu.c | 3 |
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, __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 */ |