On Mon, May 11, 2015 at 10:03:41AM +0100, Wang Kai wrote: > In log_early function, crt_early_log should also count once when > 'crt_early_log >= ARRAY_SIZE(early_log)'. Otherwise the reported > count from kmemleak_init is one less than 'actual number'. > > Then, in kmemleak_init, if early_log buffer size equal actual > number, kmemleak will init sucessful, so change warning condition > to 'crt_early_log > ARRAY_SIZE(early_log)'. > > Signed-off-by: Wang Kai <[email protected]> > --- > mm/kmemleak.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/mm/kmemleak.c b/mm/kmemleak.c > index 5405aff..6a07748 100644 > --- a/mm/kmemleak.c > +++ b/mm/kmemleak.c > @@ -814,6 +814,7 @@ static void __init log_early(int op_type, const void > *ptr, size_t size, > } > > if (crt_early_log >= ARRAY_SIZE(early_log)) { > + crt_early_log++; > kmemleak_disable(); > return; > } > @@ -1829,7 +1830,7 @@ void __init kmemleak_init(void) > object_cache = KMEM_CACHE(kmemleak_object, SLAB_NOLEAKTRACE); > scan_area_cache = KMEM_CACHE(kmemleak_scan_area, SLAB_NOLEAKTRACE); > > - if (crt_early_log >= ARRAY_SIZE(early_log)) > + if (crt_early_log > ARRAY_SIZE(early_log)) > pr_warning("Early log buffer exceeded (%d), please increase " > "DEBUG_KMEMLEAK_EARLY_LOG_SIZE\n", crt_early_log);
It looks fine: Acked-by: Catalin Marinas <[email protected]> Thanks (I assume akpm will pick it up, otherwise I'll send it during the next merging window; it's not critical) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
