summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 12:59:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-13 12:59:57 -0800
commitc11a6cfb0103d5d831e20bd9b75d10d13519fec5 (patch)
treef6706e6c68ad5c07922eb9a40e5bdb5f0a68581f /mm
parente6efef7260ac2bb170059980a78440499f2cc0db (diff)
parent8bc4a04455969c36bf54a942ad9d28d80969ed51 (diff)
downloadop-kernel-dev-c11a6cfb0103d5d831e20bd9b75d10d13519fec5.zip
op-kernel-dev-c11a6cfb0103d5d831e20bd9b75d10d13519fec5.tar.gz
Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo: "Mostly patches to initialize workqueue subsystem earlier and get rid of keventd_up(). The patches were headed for the last merge cycle but got delayed due to a bug found late minute, which is fixed now. Also, to help debugging, destroy_workqueue() is more chatty now on a sanity check failure." * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: move wq_numa_init() to workqueue_init() workqueue: remove keventd_up() debugobj, workqueue: remove keventd_up() usage slab, workqueue: remove keventd_up() usage power, workqueue: remove keventd_up() usage tty, workqueue: remove keventd_up() usage mce, workqueue: remove keventd_up() usage workqueue: make workqueue available early during boot workqueue: dump workqueue state on sanity check failures in destroy_workqueue()
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 87b29e7..29bc6c0 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -552,12 +552,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,
OpenPOWER on IntegriCloud