diff options
author | Tejun Heo <tj@kernel.org> | 2016-10-19 12:12:40 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-10-19 12:12:40 -0400 |
commit | 8bc4a04455969c36bf54a942ad9d28d80969ed51 (patch) | |
tree | 9fb87b458122c05f77b1fba28405761bedbcac1d /mm/slab.c | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
parent | 2186d9f940b6a04f263a3bacd48f2a7ba96df4cf (diff) |
Merge branch 'for-4.9' into for-4.10
Diffstat (limited to 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -550,12 +550,7 @@ static void start_cpu_timer(int cpu) | |||
550 | { | 550 | { |
551 | struct delayed_work *reap_work = &per_cpu(slab_reap_work, cpu); | 551 | struct delayed_work *reap_work = &per_cpu(slab_reap_work, cpu); |
552 | 552 | ||
553 | /* | 553 | if (reap_work->work.func == NULL) { |
554 | * When this gets called from do_initcalls via cpucache_init(), | ||
555 | * init_workqueues() has already run, so keventd will be setup | ||
556 | * at that time. | ||
557 | */ | ||
558 | if (keventd_up() && reap_work->work.func == NULL) { | ||
559 | init_reap_node(cpu); | 554 | init_reap_node(cpu); |
560 | INIT_DEFERRABLE_WORK(reap_work, cache_reap); | 555 | INIT_DEFERRABLE_WORK(reap_work, cache_reap); |
561 | schedule_delayed_work_on(cpu, reap_work, | 556 | schedule_delayed_work_on(cpu, reap_work, |