X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fworkqueue.c;h=2c2f971f3e759df3c812d749740047f05864931b;hb=81ea6550cc18ec9ddde39d679541035c325f6723;hp=0ec05948a97bb3bc4b84b271e0fd18821adff54c;hpb=138f2c357e124fa8e676e6f27cc986c3ce320130;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0ec05948a97b..2c2f971f3e75 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4457,6 +4457,17 @@ static void rebind_workers(struct worker_pool *pool)
 						  pool->attrs->cpumask) < 0);
 
 	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) {