Skip to content

Commit 40911d4

Browse files
committed
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 <[email protected]>
2 parents 3bc1e71 + aac8a59 commit 40911d4

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

kernel/workqueue.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6489,13 +6489,9 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask)
64896489
list_for_each_entry(wq, &workqueues, list) {
64906490
if (!(wq->flags & WQ_UNBOUND) || (wq->flags & __WQ_DESTROYING))
64916491
continue;
6492-
64936492
/* creating multiple pwqs breaks ordering guarantee */
6494-
if (!list_empty(&wq->pwqs)) {
6495-
if (wq->flags & __WQ_ORDERED_EXPLICIT)
6496-
continue;
6497-
wq->flags &= ~__WQ_ORDERED;
6498-
}
6493+
if (wq->flags & __WQ_ORDERED)
6494+
continue;
64996495

65006496
ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);
65016497
if (IS_ERR(ctx)) {

0 commit comments

Comments
 (0)