diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-06-06 23:38:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 01:08:17 +0200 |
| commit | aedf95ea0583676cd7bfa395681ad744791a433e (patch) | |
| tree | ec6157cd2cd37203373c4e1c8ccf93906ceed7f0 /mm/nobootmem.c | |
| parent | mm/mempool.c: update the kmemleak stack trace for mempool allocations (diff) | |
| download | linux-aedf95ea0583676cd7bfa395681ad744791a433e.tar.xz linux-aedf95ea0583676cd7bfa395681ad744791a433e.zip | |
mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
Kmemleak could ignore memory blocks allocated via memblock_alloc()
leading to false positives during scanning. This patch adds the
corresponding callbacks and removes kmemleak_free_* calls in
mm/nobootmem.c to avoid duplication.
The kmemleak_alloc() in mm/nobootmem.c is kept since
__alloc_memory_core_early() does not use memblock_alloc() directly.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | mm/nobootmem.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 04a9d94333a5..7ed58602e71b 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -197,7 +197,6 @@ unsigned long __init free_all_bootmem(void) void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, unsigned long size) { - kmemleak_free_part(__va(physaddr), size); memblock_free(physaddr, size); } @@ -212,7 +211,6 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, */ void __init free_bootmem(unsigned long addr, unsigned long size) { - kmemleak_free_part(__va(addr), size); memblock_free(addr, size); } |