diff --git a/[refs] b/[refs]
index f5247812bff5..9ecc2271d62a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0672aa7c236ada6c636e68b2ac2aa135169e6e18
+refs/heads/master: d97d476b1bb11e24268a6bac8214f9bc58716b45
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index d95ad4c37f64..8b7cb802a754 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3890,7 +3890,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
 	unsigned long flags;
 
 	local_irq_save(flags);
-	debug_check_no_locks_freed(objp, cachep->size);
+	debug_check_no_locks_freed(objp, cachep->object_size);
 	if (!(cachep->flags & SLAB_DEBUG_OBJECTS))
 		debug_check_no_obj_freed(objp, cachep->object_size);
 	__cache_free(cachep, objp, __builtin_return_address(0));