Signed-off-by: Sasha Levin alexander.levin@verizon.com --- ...free-the-temporary-struct-pcpu_alloc_info.patch | 43 ---------------------- queue-4.14/series | 1 - 2 files changed, 44 deletions(-) delete mode 100644 queue-4.14/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch
diff --git a/queue-4.14/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch b/queue-4.14/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch deleted file mode 100644 index 3f5b55599..000000000 --- a/queue-4.14/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Wed Dec 20 18:17:52 CET 2017 -From: Nicolas Pitre nicolas.pitre@linaro.org -Date: Tue, 3 Oct 2017 18:29:49 -0400 -Subject: percpu: don't forget to free the temporary struct pcpu_alloc_info - -From: Nicolas Pitre nicolas.pitre@linaro.org - - -[ Upstream commit 438a50618095061920d3a30d4c5ca1ef2e0ff860 ] - -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 -Signed-off-by: Sasha Levin alexander.levin@verizon.com -Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org ---- - mm/percpu.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/mm/percpu.c -+++ b/mm/percpu.c -@@ -1856,7 +1856,7 @@ struct pcpu_alloc_info * __init pcpu_all - __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 */ diff --git a/queue-4.14/series b/queue-4.14/series index 45ea08c57..57c224e24 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -35,7 +35,6 @@ bluetooth-hci_bcm-fix-setting-of-irq-trigger-type.patch i40e-i40evf-spread-cpu-affinity-hints-across-online-cpus-only.patch pci-aer-report-non-fatal-errors-only-to-the-affected-endpoint.patch tracing-exclude-generic-fields-from-histograms.patch -percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch asoc-codecs-msm8916-wcd-analog-fix-micbias-level.patch asoc-img-parallel-out-add-pm_runtime_get-put-to-set_fmt-callback.patch powerpc-xmon-avoid-tripping-smp-hardlockup-watchdog.patch