From 152303dc25bf267f7b130b818fe5c1e9b5018f6d Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 29 Jun 2009 09:57:10 +0300
Subject: [PATCH] --- yaml --- r: 154956 b: refs/heads/master c:
 ec5a36f94e7ca4b1f28ae4dd135cd415a704e772 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3ec163b9be07..400716d2cc60 100644
--- 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
index 5241b6598ba3..7b5d4deacfcd 100644
--- 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