Commit 40911d44 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
parents 3bc1e711 aac8a595

kernel/workqueue.c

+2 −6
Original line number Diff line number Diff line
@@ -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)

		if (wq->flags & __WQ_ORDERED)

			continue;

			wq->flags &= ~__WQ_ORDERED;

		}



		ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);

		if (IS_ERR(ctx)) {