From e2d70c863b3ad33cc52f1f60a13a222a58299f92 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 9 May 2012 16:55:19 +0100 Subject: [PATCH] --- yaml --- r: 300147 b: refs/heads/master c: 100d13c3b5b9410f604b86f5e0a34da64b8cf659 h: refs/heads/master i: 300145: acce6fef286f7dbf8c6218c6a80996b2900cbb1d 300143: 1a3a4c84980c35c1fc2daf2167800e857e1cd48b v: v3 --- [refs] | 2 +- trunk/mm/percpu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6e3e011f5b3b..2d3eca513d25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42b64281453249dac52861f9b97d18552a7ec62b +refs/heads/master: 100d13c3b5b9410f604b86f5e0a34da64b8cf659 diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c index ac5c626b44a9..bb4be7435ce3 100644 --- a/trunk/mm/percpu.c +++ b/trunk/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;