diff --git a/[refs] b/[refs]
index 916b11ec8516..1aacea67cfd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e21827aadd77e33833eeb393de2e8675e9b399e2
+refs/heads/master: 947ca1856a7e60aa6d20536785e6a42dff25aa6e
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 3b4587bb7b19..cd5a92650303 100644
--- a/trunk/mm/slab.c
+++ b/trunk/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;