From: Tejun Heo <tj@kernel.org>
Date: Tue, 6 Feb 2024 01:49:47 +0000 (-1000)
Subject: Merge branch 'for-6.8-fixes' into for-6.9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=40911d4457f288da21b45437a52e1b0cbe5b8508;p=linux.git

Merge branch 'for-6.8-fixes' into for-6.9

The for-6.8-fixes commit ae9cc8956944 ("Revert "workqueue: Override implicit
ordered attribute in workqueue_apply_unbound_cpumask()") also fixes build for

Signed-off-by: Tejun Heo <tj@kernel.org>
---

40911d4457f288da21b45437a52e1b0cbe5b8508
diff --cc kernel/workqueue.c
index ecc775843bfa,7b482a26d741..cf514ba0dfc3
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -6487,15 -5784,11 +6487,11 @@@ static int workqueue_apply_unbound_cpum
  	lockdep_assert_held(&wq_pool_mutex);
  
  	list_for_each_entry(wq, &workqueues, list) {
 -		if (!(wq->flags & WQ_UNBOUND))
 +		if (!(wq->flags & WQ_UNBOUND) || (wq->flags & __WQ_DESTROYING))
  			continue;
- 
  		/* creating multiple pwqs breaks ordering guarantee */
- 		if (!list_empty(&wq->pwqs)) {
- 			if (wq->flags & __WQ_ORDERED_EXPLICIT)
- 				continue;
- 			wq->flags &= ~__WQ_ORDERED;
- 		}
+ 		if (wq->flags & __WQ_ORDERED)
+ 			continue;
  
  		ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);
  		if (IS_ERR(ctx)) {