---

yaml --- r: 330419 b: refs/heads/master c: 947ca18 h: refs/heads/master i: 330417: 816c44c 330415: 444ec6c v: v3
git-mirror · Sep 11, 2012 · 6d38269 · 6d38269
1 parent 584a6e5
commit 6d38269
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -1774,16 +1774,16 @@ 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)
 		if (enable_cpucache(cachep, GFP_NOWAIT))
 			BUG();
 	mutex_unlock(&slab_mutex);
 
+	/* Annotate slab for lockdep -- annotate the malloc caches */
+	init_lock_keys();
+
 	/* Done! */
 	slab_state = FULL;