Merge branch 'for-4.9' into for-4.10

[mirror_ubuntu-zesty-kernel.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 090fb26b3a39b4feba105650f2a663f5c9972064..6508b4dab99d24c2fe3f7e41c9eb18a2b549277f 100644 (file)
--- 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,