Remove XXX_FROZEN state from mm/slab. Signed-off-by: Chen, Gong <gong.c...@linux.intel.com> --- mm/slab.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/mm/slab.c b/mm/slab.c index 3070b92..5490528 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -1325,20 +1325,17 @@ static int cpuup_callback(struct notifier_block *nfb, long cpu = (long)hcpu; int err = 0; - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_UP_PREPARE: - case CPU_UP_PREPARE_FROZEN: mutex_lock(&slab_mutex); err = cpuup_prepare(cpu); mutex_unlock(&slab_mutex); break; case CPU_ONLINE: - case CPU_ONLINE_FROZEN: start_cpu_timer(cpu); break; #ifdef CONFIG_HOTPLUG_CPU case CPU_DOWN_PREPARE: - case CPU_DOWN_PREPARE_FROZEN: /* * Shutdown cache reaper. Note that the slab_mutex is * held so that if cache_reap() is invoked it cannot do @@ -1350,11 +1347,9 @@ static int cpuup_callback(struct notifier_block *nfb, per_cpu(slab_reap_work, cpu).work.func = NULL; break; case CPU_DOWN_FAILED: - case CPU_DOWN_FAILED_FROZEN: start_cpu_timer(cpu); break; case CPU_DEAD: - case CPU_DEAD_FROZEN: /* * Even if all the cpus of a node are down, we don't free the * kmem_cache_node of any cache. This to avoid a race between @@ -1366,7 +1361,6 @@ static int cpuup_callback(struct notifier_block *nfb, /* fall through */ #endif case CPU_UP_CANCELED: - case CPU_UP_CANCELED_FROZEN: mutex_lock(&slab_mutex); cpuup_canceled(cpu); mutex_unlock(&slab_mutex); -- 2.0.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/