remove queue-3.0/kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp...

diff --git a/queue-3.0/kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp.patch b/queue-3.0/kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp.patch
deleted file mode 100644 (file)
index 608c9a6..0000000
--- a/queue-3.0/kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 100d13c3b5b9410f604b86f5e0a34da64b8cf659 Mon Sep 17 00:00:00 2001
-From: Catalin Marinas <catalin.marinas@arm.com>
-Date: Wed, 9 May 2012 16:55:19 +0100
-Subject: kmemleak: Fix the kmemleak tracking of the percpu areas with !SMP
-
-From: Catalin Marinas <catalin.marinas@arm.com>
-
-commit 100d13c3b5b9410f604b86f5e0a34da64b8cf659 upstream.
-
-Kmemleak tracks the percpu allocations via a specific API and the
-originally allocated areas must be removed from kmemleak (via
-kmemleak_free). The code was already doing this for SMP systems.
-
-Reported-by: Sami Liedes <sami.liedes@iki.fi>
-Cc: Tejun Heo <tj@kernel.org>
-Cc: Christoph Lameter <cl@linux-foundation.org>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- mm/percpu.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/mm/percpu.c
-+++ b/mm/percpu.c
-@@ -1873,6 +1873,8 @@ void __init setup_per_cpu_areas(void)
-       fc = __alloc_bootmem(unit_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
-       if (!ai || !fc)
-               panic("Failed to allocate memory for percpu areas.");
-+      /* kmemleak tracks the percpu allocations separately */
-+      kmemleak_free(fc);
- 
-       ai->dyn_size = unit_size;
-       ai->unit_size = unit_size;

diff --git a/queue-3.0/series b/queue-3.0/series
index 006089e25393fd3ac8de8d5def2c09997417f132..e670e854316208ec7ce22d26ff7f53b86e3dc86b 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -28,7 +28,6 @@ media-rc-postpone-isr-registration.patch
 cdc_ether-ignore-bogus-union-descriptor-for-rndis-devices.patch
 cdc_ether-add-novatel-usb551l-device-ids-for-flag_wwan.patch
 percpu-pcpu_embed_first_chunk-should-free-unused-parts-after-all-allocs-are-complete.patch
-kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp.patch
 hugetlb-prevent-bug_on-in-hugetlb_fault-hugetlb_cow.patch
 mm-nobootmem-fix-sign-extend-problem-in-__free_pages_memory.patch
 jffs2-fix-lock-acquisition-order-bug-in-gc-path.patch