diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-10-16 17:00:19 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-20 14:20:45 -0400 |
| commit | 68e945c82914ca7381f5b890f07268eec010b592 (patch) | |
| tree | a09e62e23e54ff7aa037261718504bb58e1e07fa | |
| parent | 755415a953d528c783df701eb57ba6ae6a447d32 (diff) | |
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 <rostedt@goodmis.org>
| -rw-r--r-- | mm/slab.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c index 119969a7fc74..27a194c696e6 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1763,15 +1763,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; |