slab: fix the DEADLOCK issue on l3 alien lock

[deliverable/linux.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 3b4587bb7b19ed5b859a9f58c3a86a79d67cc2b9..cd5a92650303c251bf1b769feea8c807e85fa15b 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1774,9 +1774,6 @@ void __init kmem_cache_init_late(void)
 
        slab_state = UP;
 
-       /* Annotate slab for lockdep -- annotate the malloc caches */
-       init_lock_keys();
-
        /* 6) resize the head arrays to their final sizes */
        mutex_lock(&slab_mutex);
        list_for_each_entry(cachep, &slab_caches, list)
@@ -1784,6 +1781,9 @@ void __init kmem_cache_init_late(void)
                        BUG();
        mutex_unlock(&slab_mutex);
 
+       /* Annotate slab for lockdep -- annotate the malloc caches */
+       init_lock_keys();
+
        /* Done! */
        slab_state = FULL;