Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[firefly-linux-kernel-4.4.55.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 57ab42297d96b402775689c004e1cc5ec3491b15..35cb0c861508c898264c56818ac431086c6f39e1 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -714,7 +714,7 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
        printk(KERN_ERR "slab error in %s(): cache `%s': %s\n",
               function, cachep->name, msg);
        dump_stack();
-       add_taint(TAINT_BAD_PAGE);
+       add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
 }
 #endif
 
@@ -1923,11 +1923,9 @@ static void print_objinfo(struct kmem_cache *cachep, void *objp, int lines)
        }
 
        if (cachep->flags & SLAB_STORE_USER) {
-               printk(KERN_ERR "Last user: [<%p>]",
-                       *dbg_userword(cachep, objp));
-               print_symbol("(%s)",
-                               (unsigned long)*dbg_userword(cachep, objp));
-               printk("\n");
+               printk(KERN_ERR "Last user: [<%p>](%pSR)\n",
+                      *dbg_userword(cachep, objp),
+                      *dbg_userword(cachep, objp));
        }
        realobj = (char *)objp + obj_offset(cachep);
        size = cachep->object_size;