drop percpu patch from 3.18 as well

diff --git a/queue-3.18/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch b/queue-3.18/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch
deleted file mode 100644 (file)
index 19c2190..0000000
--- a/queue-3.18/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From foo@baz Thu Dec 21 10:55:04 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
-@@ -1402,7 +1402,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;
-@@ -2268,6 +2268,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-3.18/series b/queue-3.18/series
index b583e79d6200527d7c838fa2845e870970d69d7f..9f8678459acade5abe89149954de4650aa91e60b 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -33,7 +33,6 @@ scsi-cxgb4i-fix-tx-skb-leak.patch
 pci-create-sr-iov-virtfn-physfn-links-before-attaching-driver.patch
 igb-check-memory-allocation-failure.patch
 pci-aer-report-non-fatal-errors-only-to-the-affected-endpoint.patch
-percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch
 scsi-lpfc-fix-secure-firmware-updates.patch
 scsi-lpfc-plogi-failures-during-npiv-testing.patch
 fm10k-ensure-we-process-sm-mbx-when-processing-vf-mbx.patch