diff options
author | Lai Jiangshan <jiangshanlai@gmail.com> | 2017-12-01 09:23:07 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2017-12-04 17:46:09 -0500 |
commit | 62408c1ef00784e8bcfc4848ade76480fb8aed21 (patch) | |
tree | 75a35a2c949b99866f5e840e6da2fdd4622720b0 | |
parent | e8b3f8db7aad99fcc5234fc5b89984ff6620de3d (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>
-rw-r--r-- | kernel/workqueue.c | 10 |
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) | |||
4589 | 4589 | ||
4590 | spin_lock_irq(&pool->lock); | 4590 | spin_lock_irq(&pool->lock); |
4591 | 4591 | ||
4592 | /* | ||
4593 | * XXX: CPU hotplug notifiers are weird and can call DOWN_FAILED | ||
4594 | * w/o preceding DOWN_PREPARE. Work around it. CPU hotplug is | ||
4595 | * being reworked and this can go away in time. | ||
4596 | */ | ||
4597 | if (!(pool->flags & POOL_DISASSOCIATED)) { | ||
4598 | spin_unlock_irq(&pool->lock); | ||
4599 | return; | ||
4600 | } | ||
4601 | |||
4602 | pool->flags &= ~POOL_DISASSOCIATED; | 4592 | pool->flags &= ~POOL_DISASSOCIATED; |
4603 | 4593 | ||
4604 | for_each_pool_worker(worker, pool) { | 4594 | for_each_pool_worker(worker, pool) { |