Skip to content

Commit d363a90

Browse files
committed
Merge branch 'for-6.6-fixes' into for-next
2 parents 9413336 + ca10d85 commit d363a90

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

kernel/workqueue.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5792,9 +5792,13 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask)
57925792
list_for_each_entry(wq, &workqueues, list) {
57935793
if (!(wq->flags & WQ_UNBOUND))
57945794
continue;
5795+
57955796
/* creating multiple pwqs breaks ordering guarantee */
5796-
if (wq->flags & __WQ_ORDERED)
5797-
continue;
5797+
if (!list_empty(&wq->pwqs)) {
5798+
if (wq->flags & __WQ_ORDERED_EXPLICIT)
5799+
continue;
5800+
wq->flags &= ~__WQ_ORDERED;
5801+
}
57985802

57995803
ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);
58005804
if (IS_ERR(ctx)) {

0 commit comments

Comments
 (0)