diff --git a/[refs] b/[refs] index 3fef4bc06121..eba0e6f68b45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd6789675ebfb9185cb4fb68dc51010b4e95d952 +refs/heads/master: 008139d9146f9afee0e58df4b7422d0c9921f8ce diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index 701740c9e81b..555d5d2731c6 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -521,7 +521,11 @@ 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); + /* + * The min_count is set to 0 so that bootmem allocated blocks + * are never reported as leaks. + */ + kmemleak_alloc(region, size, 0, 0); return region; }