summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-05-09 16:55:19 +0100
committerTejun Heo <tj@kernel.org>2012-05-09 10:13:29 -0700
commit100d13c3b5b9410f604b86f5e0a34da64b8cf659 (patch)
treed28702d0290cd2da7e443d798baab10ac831c4fe /mm
parent42b64281453249dac52861f9b97d18552a7ec62b (diff)
downloadlinux-3.10-100d13c3b5b9410f604b86f5e0a34da64b8cf659.tar.gz
linux-3.10-100d13c3b5b9410f604b86f5e0a34da64b8cf659.tar.bz2
linux-3.10-100d13c3b5b9410f604b86f5e0a34da64b8cf659.zip
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> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/percpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index ac5c626b44a..bb4be7435ce 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1895,6 +1895,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;