diff options
| author | Tejun Heo | 2016-10-19 18:12:40 +0200 |
|---|---|---|
| committer | Tejun Heo | 2016-10-19 18:12:40 +0200 |
| commit | 8bc4a04455969c36bf54a942ad9d28d80969ed51 (patch) | |
| tree | 9fb87b458122c05f77b1fba28405761bedbcac1d /mm/slab.c | |
| parent | Linux 4.9-rc1 (diff) | |
| parent | workqueue: move wq_numa_init() to workqueue_init() (diff) | |
| download | kernel-qcow2-linux-8bc4a04455969c36bf54a942ad9d28d80969ed51.tar.gz kernel-qcow2-linux-8bc4a04455969c36bf54a942ad9d28d80969ed51.tar.xz kernel-qcow2-linux-8bc4a04455969c36bf54a942ad9d28d80969ed51.zip | |
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
diff --git a/mm/slab.c b/mm/slab.c index 090fb26b3a39..6508b4dab99d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -550,12 +550,7 @@ static void start_cpu_timer(int cpu) { struct delayed_work *reap_work = &per_cpu(slab_reap_work, cpu); - /* - * When this gets called from do_initcalls via cpucache_init(), - * init_workqueues() has already run, so keventd will be setup - * at that time. - */ - if (keventd_up() && reap_work->work.func == NULL) { + if (reap_work->work.func == NULL) { init_reap_node(cpu); INIT_DEFERRABLE_WORK(reap_work, cache_reap); schedule_delayed_work_on(cpu, reap_work, |