diff options
| author | Tejun Heo <tj@kernel.org> | 2024-02-06 02:49:47 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-02-06 02:49:47 +0100 |
| commit | 40911d4457f288da21b45437a52e1b0cbe5b8508 (patch) | |
| tree | 0dbc484a6b0ef9749129c81a07a4f0cb8dae6a7d /kernel/workqueue.c | |
| parent | workqueue: Don't implicitly make UNBOUND workqueues w/ @max_active==1 ordered (diff) | |
| parent | Revert "workqueue: Override implicit ordered attribute in workqueue_apply_unb... (diff) | |
| download | linux-40911d4457f288da21b45437a52e1b0cbe5b8508.tar.xz linux-40911d4457f288da21b45437a52e1b0cbe5b8508.zip | |
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>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index ecc775843bfa..cf514ba0dfc3 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -6489,13 +6489,9 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask) list_for_each_entry(wq, &workqueues, list) { 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)) { |