diff options
| author | Linus Torvalds | 2017-11-15 14:17:11 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-15 14:17:11 -0800 |
| commit | 766ec76a27aa9dfdfee3a80f29ddc1f7539c71f9 (patch) | |
| tree | 95f096ce298606ef9f12195a24c10b2869bcb7a1 /mm/percpu.c | |
| parent | 0be500363c6709032254cd52c8059d9ace61de73 (diff) | |
| parent | 438a50618095061920d3a30d4c5ca1ef2e0ff860 (diff) | |
Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull percpu update from Tejun Heo:
"Another minor pull request. It only contains one commit which can
reclaim a bit of memory wasted during boot on UP"
* 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: don't forget to free the temporary struct pcpu_alloc_info
Diffstat (limited to 'mm/percpu.c')
| -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 a0e0c82c1e4c..79e3549cab0f 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1856,7 +1856,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; @@ -2719,6 +2719,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 */ |