lkml.org 
[lkml]   [2012]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: kmemleak: Cannot insert 0xffff880007fedd28 into the object search tree (already existing)
On Wed, May 09, 2012 at 04:55:19PM +0100, Catalin Marinas wrote:
> ----------------8<---------------------------------------------

git-am doesn't handle patches submitted this way. Can you please put
the patch title as $SUBJ and put patch description in the body
followed by '---' for non-description comments? Or is there some tool
that I should be using instead?

> commit 631d16e6284ddecd9d261f929582244f6757b678
> Author: Catalin Marinas <catalin.marinas@arm.com>
> Date: Wed May 9 16:45:46 2012 +0100
>
> kmemleak: Fix the kmemleak tracking of the percpu areas with !SMP
>
> 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>
>
> diff --git a/mm/percpu.c b/mm/percpu.c
> index f47af91..2daf6d5 100644
> --- a/mm/percpu.c
> +++ b/mm/percpu.c
> @@ -1885,6 +1885,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;

Applied to percpu/for-3.4-fixes. Thanks.

--
tejun


\
 
 \ /
  Last update: 2012-05-09 19:41    [from the cache]
©2003-2011 Jasper Spaans