path: root/mm
diff options
authorCatalin Marinas <catalin.marinas@arm.com>2010-07-19 11:54:15 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2010-07-19 11:54:15 +0100
commit9078370c0d2cfe4a905aa34f398bbb0d65921a2b (patch)
tree0b0d3b1f2a9a6dd2f2deaae9fbf9c8c5509ac13c /mm
parent7952f98818d561ed0e11434a7a16acd9a7bae859 (diff)
kmemleak: Add support for NO_BOOTMEM configurations
With commits 08677214 and 59be5a8e, alloc_bootmem()/free_bootmem() and friends use the early_res functions for memory management when NO_BOOTMEM is enabled. This patch adds the kmemleak calls in the corresponding code paths for bootmem allocations. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Yinghai Lu <yinghai@kernel.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: stable@kernel.org
Diffstat (limited to 'mm')
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 431214b941a..68319dd20be 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3659,6 +3659,11 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
ptr = phys_to_virt(addr);
memset(ptr, 0, size);
reserve_early_without_check(addr, addr + size, "BOOTMEM");
+ /*
+ * The min_count is set to 0 so that bootmem allocated blocks
+ * are never reported as leaks.
+ */
+ kmemleak_alloc(ptr, size, 0, 0);
return ptr;