From 0ea29578d5faf12e2fac6bfc0169c9f78f2a0b7f Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Thu, 21 Jun 2012 00:59:18 +0400 Subject: [PATCH] --- yaml --- r: 319571 b: refs/heads/master c: a164f89628fa813a2b012ec033625e9e507c29bb h: refs/heads/master i: 319569: 61e0a81a50d8786d575485a2d9e8140e5e66003a 319567: 368bc4d34af8485b830c5003dfaf2e4b13690f4d v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9ecc2271d62a..48720ed1842c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d97d476b1bb11e24268a6bac8214f9bc58716b45 +refs/heads/master: a164f89628fa813a2b012ec033625e9e507c29bb diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 8b7cb802a754..105f188d14a3 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -1668,9 +1668,6 @@ void __init kmem_cache_init_late(void) BUG(); mutex_unlock(&cache_chain_mutex); - /* Done! */ - g_cpucache_up = FULL; - /* * Register a cpu startup notifier callback that initializes * cpu_cache_get for all new cpus @@ -1700,6 +1697,9 @@ static int __init cpucache_init(void) */ for_each_online_cpu(cpu) start_cpu_timer(cpu); + + /* Done! */ + g_cpucache_up = FULL; return 0; } __initcall(cpucache_init); @@ -2167,7 +2167,7 @@ static size_t calculate_slab_order(struct kmem_cache *cachep, static int __init_refok setup_cpu_cache(struct kmem_cache *cachep, gfp_t gfp) { - if (g_cpucache_up == FULL) + if (g_cpucache_up >= LATE) return enable_cpucache(cachep, gfp); if (g_cpucache_up == NONE) {