Merge master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 1c46c6383552ffa82921934bb6ce05715dd0fd88..9374293a301297edef94491494db8e58f591ba82 100644 (file)
--- 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, obj_reallen(c));
        __cache_free(c, (void *)objp);
        local_irq_restore(flags);
 }