diff options
| author | SpiritCroc <dev@spiritcroc.de> | 2020-02-20 16:15:19 +0100 |
|---|---|---|
| committer | SpiritCroc <dev@spiritcroc.de> | 2020-02-20 16:15:19 +0100 |
| commit | aba7fab93b0de56479c04e313f75eebd7e7d5769 (patch) | |
| tree | ea58d7766bfdbcd4d1aa3c842fd540c0c5a58866 /lib/debugobjects.c | |
| parent | 7d8883219cde3f0d993b6c87c180a9464b654d27 (diff) | |
| parent | d95bed04b9e6f49e0ff8454ed765b9e0ba1e8819 (diff) | |
Merge remote-tracking branch 'sony/aosp/LA.UM.7.1.r1' into q10.0-4.14q10.0-4.14
Change-Id: I130af189da62f8eaca8c732a2cf3d434b1c3f26d
Diffstat (limited to 'lib/debugobjects.c')
| -rw-r--r-- | lib/debugobjects.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index 99308479b1c8..bacb00a9cd9f 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -111,7 +111,6 @@ static void fill_pool(void) if (!new) return; - kmemleak_ignore(new); raw_spin_lock_irqsave(&pool_lock, flags); hlist_add_head(&new->node, &obj_pool); debug_objects_allocated++; @@ -1085,7 +1084,6 @@ static int __init debug_objects_replace_static_objects(void) obj = kmem_cache_zalloc(obj_cache, GFP_KERNEL); if (!obj) goto free; - kmemleak_ignore(obj); hlist_add_head(&obj->node, &objects); } @@ -1141,7 +1139,8 @@ void __init debug_objects_mem_init(void) obj_cache = kmem_cache_create("debug_objects_cache", sizeof (struct debug_obj), 0, - SLAB_DEBUG_OBJECTS, NULL); + SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE, + NULL); if (!obj_cache || debug_objects_replace_static_objects()) { debug_objects_enabled = 0; |