drop percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch from...

diff --git a/queue-4.4/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch b/queue-4.4/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch
deleted file mode 100644 (file)
index 07a7cec..0000000
--- a/queue-4.4/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:35:49 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;
-@@ -2265,6 +2265,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.4/series b/queue-4.4/series
index e49c6161e41227822ed5471d8bb2bf00456f4087..f4ba9a310bdca64ff4ef4c4169b78449cfa5de76 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -64,7 +64,6 @@ pci-create-sr-iov-virtfn-physfn-links-before-attaching-driver.patch
 igb-check-memory-allocation-failure.patch
 ixgbe-fix-use-of-uninitialized-padding.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

diff --git a/queue-4.9/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch b/queue-4.9/percpu-don-t-forget-to-free-the-temporary-struct-pcpu_alloc_info.patch
deleted file mode 100644 (file)
index 9ac0b2e..0000000
--- a/queue-4.9/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 09:02:40 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
-@@ -1400,7 +1400,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;
-@@ -2264,6 +2264,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.9/series b/queue-4.9/series
index 0044c37f7ef24c4731a2754fc0e2c14dccd6dee9..62e2abda6c48537e34b489884486cfb685a409b0 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -95,7 +95,6 @@ ixgbe-fix-use-of-uninitialized-padding.patch
 ib-rxe-check-for-allocation-failure-on-elem.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-img-parallel-out-add-pm_runtime_get-put-to-set_fmt-callback.patch
 fm10k-fix-mis-ordered-parameters-in-declaration-for-.ndo_set_vf_bw.patch
 scsi-lpfc-fix-secure-firmware-updates.patch