From 6bbf73020d80baa3eab10628b6556de96dcc6274 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 16 Oct 2012 17:00:19 -0400 Subject: [PATCH 286/290] slab: Fix up stable merge of slab init_lock_keys() There was a stable fix that moved the init_lock_keys() to after the enable_cpucache(). But -rt changed this function to init_cachep_lock_keys(). This moves the init afterwards to match the stable fix. Signed-off-by: Steven Rostedt --- mm/slab.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 81d3481..fff347f 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1747,15 +1747,12 @@ void __init kmem_cache_init_late(void) /* 6) resize the head arrays to their final sizes */ mutex_lock(&cache_chain_mutex); list_for_each_entry(cachep, &cache_chain, next) { - init_cachep_lock_keys(cachep); if (enable_cpucache(cachep, GFP_NOWAIT)) BUG(); + init_cachep_lock_keys(cachep); } mutex_unlock(&cache_chain_mutex); - /* Annotate slab for lockdep -- annotate the malloc caches */ - init_lock_keys(); - /* Done! */ g_cpucache_up = FULL;