Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6

1 files changed, 1 insertions, 0 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 1c46c6383552..33aab345cd4a 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3071,6 +3071,7 @@ void kfree(const void *objp)
         local_irq_save(flags);
         kfree_debugcheck(objp);
         c = page_get_cache(virt_to_page(objp));
+        mutex_debug_check_no_locks_freed(objp, objp+obj_reallen(c));
         __cache_free(c, (void *)objp);
         local_irq_restore(flags);
 }