---

yaml
---
r: 327169
b: refs/heads/master
c: e2b6a6d
h: refs/heads/master
i:
  327167: 647ee45
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aabe902ca3638d862bf0dad5a697d3a8e046b0a
+refs/heads/master: e2b6a6d570f070aa90ac00d2d10b1488512f8520

trunk/kernel/workqueue.c

@@ -1741,6 +1741,7 @@ static void rebind_workers(struct global_cwq *gcwq)
 	/* rebind busy workers */
 	for_each_busy_worker(worker, i, pos, gcwq) {
 		struct work_struct *rebind_work = &worker->rebind_work;
+		struct workqueue_struct *wq;
 
 		/* morph UNBOUND to REBIND */
 		worker->flags &= ~WORKER_UNBOUND;
@@ -1750,11 +1751,20 @@ static void rebind_workers(struct global_cwq *gcwq)
 				     work_data_bits(rebind_work)))
 			continue;
 
-		/* wq doesn't matter, use the default one */
 		debug_work_activate(rebind_work);
-		insert_work(get_cwq(gcwq->cpu, system_wq), rebind_work,
-			    worker->scheduled.next,
-			    work_color_to_flags(WORK_NO_COLOR));
+
+		/*
+		 * wq doesn't really matter but let's keep @worker->pool
+		 * and @cwq->pool consistent for sanity.
+		 */
+		if (worker_pool_pri(worker->pool))
+			wq = system_highpri_wq;
+		else
+			wq = system_wq;
+
+		insert_work(get_cwq(gcwq->cpu, wq), rebind_work,
+			worker->scheduled.next,
+			work_color_to_flags(WORK_NO_COLOR));
 	}
 }