diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-07-16 23:48:59 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-07-16 23:48:59 -0400 |
| commit | 185436e33b5fb84b783723f317e12258d725e22b (patch) | |
| tree | a746993fa52da3962619f8cd28afd75684c05ba8 /mm/page_alloc.c | |
| parent | 58a7ec89680147a0c0382257d1ce32ab4cb0d411 (diff) | |
| parent | 4298370d35a9ab40e60a9130de05e61727454571 (diff) | |
Merge remote branch 'catalin/rebased'linaro_merge_100716
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Diffstat (limited to 'mm/page_alloc.c')
| -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 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; } |