2 files changed, 8 insertions, 4 deletions

diff --git a/mm/memblock.c b/mm/memblock.c
index 0aa0d2b07624..6d2f219a48b0 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -691,6 +691,7 @@ int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
                      (unsigned long long)base + size - 1,
                      (void *)_RET_IP_);
 
+        kmemleak_free_part(__va(base), size);
         return memblock_remove_range(&memblock.reserved, base, size);
 }
 
@@ -1043,9 +1044,14 @@ static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
                 align = SMP_CACHE_BYTES;
 
         found = memblock_find_in_range_node(size, align, start, end, nid);
-        if (found && !memblock_reserve(found, size))
+        if (found && !memblock_reserve(found, size)) {
+                /*
+                 * The min_count is set to 0 so that memblock allocations are
+                 * never reported as leaks.
+                 */
+                kmemleak_alloc(__va(found), size, 0, 0);
                 return found;
-
+        }
         return 0;
 }
 
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);
 }