---

yaml --- r: 154956 b: refs/heads/master c: ec5a36f h: refs/heads/master v: v3
git-mirror · Jun 29, 2009 · 152303d · 152303d
1 parent eee7721
commit 152303d
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: 7ed9f7e5db58c6e8c2b4b738a75d5dcd8e17aad5
+refs/heads/master: ec5a36f94e7ca4b1f28ae4dd135cd415a704e772
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
@@ -1544,9 +1544,6 @@ void __init kmem_cache_init(void)
 	}
 
 	g_cpucache_up = EARLY;
-
-	/* Annotate slab for lockdep -- annotate the malloc caches */
-	init_lock_keys();
 }
 
 void __init kmem_cache_init_late(void)
@@ -1563,6 +1560,9 @@ void __init kmem_cache_init_late(void)
 	/* Done! */
 	g_cpucache_up = FULL;
 
+	/* Annotate slab for lockdep -- annotate the malloc caches */
+	init_lock_keys();
+
 	/*
 	 * Register a cpu startup notifier callback that initializes
 	 * cpu_cache_get for all new cpus