diff --git a/[refs] b/[refs] index 1fbf5ea695f3..a1f8eed6ec77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f59de8992aa6dc85e81aadc26b0f69e17809721d +refs/heads/master: 30765b92ada267c5395fc788623cb15233276f5c diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 0703578fb4d7..6d90a091fdca 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -1666,6 +1666,9 @@ void __init kmem_cache_init_late(void) { struct kmem_cache *cachep; + /* Annotate slab for lockdep -- annotate the malloc caches */ + init_lock_keys(); + /* 6) resize the head arrays to their final sizes */ mutex_lock(&cache_chain_mutex); list_for_each_entry(cachep, &cache_chain, next) @@ -1676,9 +1679,6 @@ 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