This reverts commit b5149873a0c299195b5346fe4dc2c5b04ae2f995. It conflicts with the following isolcpus change from the sched branch. edb9382175c3 ("sched/isolation: Move isolcpus= handling to the housekeeping code") Let's revert for now.
Showing the changes to kernel/workqueue.c (1 of 1 file). Show all
Unified · Split
| @@ -4980,10 +4980,6 @@ int workqueue_set_unbound_cpumask(cpumask_var_t cpumask) · 4979 unmodified lines | ||
| 4980 | 4980 | if (!zalloc_cpumask_var(&saved_cpumask, GFP_KERNEL)) |
| 4981 | 4981 | return -ENOMEM; |
| 4982 | 4982 | |
| 4983 | − /* | |
| 4984 | − * Not excluding isolated cpus on purpose. | |
| 4985 | − * If the user wishes to include them, we allow that. | |
| 4986 | − */ | |
| 4987 | 4983 | cpumask_and(cpumask, cpumask, cpu_possible_mask); |
| 4988 | 4984 | if (!cpumask_empty(cpumask)) { |
| 4989 | 4985 | apply_wqattrs_lock(); |
| @@ -5583,7 +5579,7 @@ int __init workqueue_init_early(void) · 593 unmodified lines | ||
| 5583 | 5579 | WARN_ON(__alignof__(struct pool_workqueue) < __alignof__(long long)); |
| 5584 | 5580 | |
| 5585 | 5581 | BUG_ON(!alloc_cpumask_var(&wq_unbound_cpumask, GFP_KERNEL)); |
| 5586 | − cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map); | |
| 5582 | + cpumask_copy(wq_unbound_cpumask, cpu_possible_mask); | |
| 5587 | 5583 | |
| 5588 | 5584 | pwq_cache = KMEM_CACHE(pool_workqueue, SLAB_PANIC); |
| 5589 | 5585 | |