diff --git a/[refs] b/[refs] index 2ecf84d13538..61aa8949f0fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53238a60dd4a679f6fe5613a7ed46899587205cf +refs/heads/master: ec3a354bd46cbdaa7933ba57a142ee2d2dbde0e5 diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index d2a9ce952768..701740c9e81b 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -335,6 +336,8 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, { unsigned long start, end; + kmemleak_free_part(__va(physaddr), size); + start = PFN_UP(physaddr); end = PFN_DOWN(physaddr + size); @@ -354,6 +357,8 @@ void __init free_bootmem(unsigned long addr, unsigned long size) { unsigned long start, end; + kmemleak_free_part(__va(addr), size); + start = PFN_UP(addr); end = PFN_DOWN(addr + size); @@ -516,6 +521,7 @@ static void * __init alloc_bootmem_core(struct bootmem_data *bdata, region = phys_to_virt(PFN_PHYS(bdata->node_min_pfn) + start_off); memset(region, 0, size); + kmemleak_alloc(region, size, 1, 0); return region; }