summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLai Jiangshan <jiangshanlai@gmail.com>2017-12-01 22:23:07 +0800
committerTejun Heo <tj@kernel.org>2017-12-04 14:46:09 -0800
commit62408c1ef00784e8bcfc4848ade76480fb8aed21 (patch)
tree75a35a2c949b99866f5e840e6da2fdd4622720b0 /kernel
parente8b3f8db7aad99fcc5234fc5b89984ff6620de3d (diff)
workqueue/hotplug: remove the workaround in rebind_workers()
Since the cpu/hotplug refactoring, DOWN_FAILED is never called without preceding DOWN_PREPARE making the workaround unnecessary. Remove it. Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 48a4d00f55dc..45ce93f3dd1f 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4589,16 +4589,6 @@ static void rebind_workers(struct worker_pool *pool)
spin_lock_irq(&pool->lock);
- /*
- * XXX: CPU hotplug notifiers are weird and can call DOWN_FAILED
- * w/o preceding DOWN_PREPARE. Work around it. CPU hotplug is
- * being reworked and this can go away in time.
- */
- if (!(pool->flags & POOL_DISASSOCIATED)) {
- spin_unlock_irq(&pool->lock);
- return;
- }
-
pool->flags &= ~POOL_DISASSOCIATED;
for_each_pool_worker(worker, pool) {