diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2010-07-19 06:54:15 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2010-07-19 06:54:15 -0400 |
commit | 9078370c0d2cfe4a905aa34f398bbb0d65921a2b (patch) | |
tree | 0b0d3b1f2a9a6dd2f2deaae9fbf9c8c5509ac13c /mm | |
parent | 7952f98818d561ed0e11434a7a16acd9a7bae859 (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')
-rw-r--r-- | mm/page_alloc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 431214b941ac..68319dd20bed 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, | |||
3659 | ptr = phys_to_virt(addr); | 3659 | ptr = phys_to_virt(addr); |
3660 | memset(ptr, 0, size); | 3660 | memset(ptr, 0, size); |
3661 | reserve_early_without_check(addr, addr + size, "BOOTMEM"); | 3661 | reserve_early_without_check(addr, addr + size, "BOOTMEM"); |
3662 | /* | ||
3663 | * The min_count is set to 0 so that bootmem allocated blocks | ||
3664 | * are never reported as leaks. | ||
3665 | */ | ||
3666 | kmemleak_alloc(ptr, size, 0, 0); | ||
3662 | return ptr; | 3667 | return ptr; |
3663 | } | 3668 | } |
3664 | 3669 | ||