From: Greg Kroah-Hartman Date: Sat, 19 May 2012 14:47:24 +0000 (-0700) Subject: remove queue-3.0/kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp... X-Git-Tag: v3.0.32~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9ddf3e0e5e24105cfed1287e3b59bbb6d8ec8db;p=thirdparty%2Fkernel%2Fstable-queue.git remove queue-3.0/kmemleak-fix-the-kmemleak-tracking-of-the-percpu-areas-with-smp.patch --- 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 index 608c9a690fc..00000000000 --- 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 -Date: Wed, 9 May 2012 16:55:19 +0100 -Subject: kmemleak: Fix the kmemleak tracking of the percpu areas with !SMP - -From: Catalin Marinas - -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 -Cc: Tejun Heo -Cc: Christoph Lameter -Signed-off-by: Catalin Marinas -Signed-off-by: Tejun Heo -Signed-off-by: Greg Kroah-Hartman - ---- - 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 006089e2539..e670e854316 100644 --- 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