1 files changed, 8 insertions, 7 deletions

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 994be4805cec..14afeeb7d6ef 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -135,7 +135,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++;
@@ -360,9 +359,12 @@ static void debug_object_is_on_stack(void *addr, int onstack)
 
         limit++;
         if (is_on_stack)
-                pr_warn("object is on stack, but not annotated\n");
+                pr_warn("object %p is on stack %p, but NOT annotated.\n", addr,
+                         task_stack_page(current));
         else
-                pr_warn("object is not on stack, but annotated\n");
+                pr_warn("object %p is NOT on stack %p, but annotated.\n", addr,
+                         task_stack_page(current));
+
         WARN_ON(1);
 }
 
@@ -1125,7 +1127,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);
         }
 
@@ -1181,12 +1182,12 @@ 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;
-                if (obj_cache)
-                        kmem_cache_destroy(obj_cache);
+                kmem_cache_destroy(obj_cache);
                 pr_warn("out of memory.\n");
         } else
                 debug_objects_selftest();