1 files changed, 10 insertions, 4 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 39d20f8a0791..06236e4ddc1b 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -110,6 +110,7 @@
 #include        <linux/fault-inject.h>
 #include        <linux/rtmutex.h>
 #include        <linux/reciprocal_div.h>
+#include        <linux/debugobjects.h>
 
 #include        <asm/cacheflush.h>
 #include        <asm/tlbflush.h>
@@ -174,12 +175,14 @@
                          SLAB_CACHE_DMA | \
                          SLAB_STORE_USER | \
                          SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
-                         SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD)
+                         SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
+                         SLAB_DEBUG_OBJECTS)
 #else
 # define CREATE_MASK    (SLAB_HWCACHE_ALIGN | \
                          SLAB_CACHE_DMA | \
                          SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
-                         SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD)
+                         SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
+                         SLAB_DEBUG_OBJECTS)
 #endif
 
 /*
@@ -858,7 +861,7 @@ static void cache_estimate(unsigned long gfporder, size_t buffer_size,
         *left_over = slab_size - nr_objs*buffer_size - mgmt_size;
 }
 
-#define slab_error(cachep, msg) __slab_error(__FUNCTION__, cachep, msg)
+#define slab_error(cachep, msg) __slab_error(__func__, cachep, msg)
 
 static void __slab_error(const char *function, struct kmem_cache *cachep,
                         char *msg)
@@ -2153,7 +2156,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
          */
         if (!name || in_interrupt() || (size < BYTES_PER_WORD) ||
             size > KMALLOC_MAX_SIZE) {
-                printk(KERN_ERR "%s: Early error in slab %s\n", __FUNCTION__,
+                printk(KERN_ERR "%s: Early error in slab %s\n", __func__,
                                 name);
                 BUG();
         }
@@ -3760,6 +3763,8 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
 
         local_irq_save(flags);
         debug_check_no_locks_freed(objp, obj_size(cachep));
+        if (!(cachep->flags & SLAB_DEBUG_OBJECTS))
+                debug_check_no_obj_freed(objp, obj_size(cachep));
         __cache_free(cachep, objp);
         local_irq_restore(flags);
 }
@@ -3785,6 +3790,7 @@ void kfree(const void *objp)
         kfree_debugcheck(objp);
         c = virt_to_cache(objp);
         debug_check_no_locks_freed(objp, obj_size(c));
+        debug_check_no_obj_freed(objp, obj_size(c));
         __cache_free(c, (void *)objp);
         local_irq_restore(flags);
 }