diff options
| author | Tejun Heo <tj@kernel.org> | 2017-11-03 15:02:15 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-11-03 15:02:15 +0100 |
| commit | edbfd9112f70c34b2965580a67dad5fb306fb6c9 (patch) | |
| tree | 7dc45dcef880b55493a9ea8b69799ccf70a58b72 /kernel | |
| parent | workqueue: respect isolated cpus when queueing an unbound work (diff) | |
| download | linux-edbfd9112f70c34b2965580a67dad5fb306fb6c9.tar.xz linux-edbfd9112f70c34b2965580a67dad5fb306fb6c9.zip | |
Revert "workqueue: respect isolated cpus when queueing an unbound work"
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.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index bfa433b38a61..64d0edf428f8 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4980,10 +4980,6 @@ int workqueue_set_unbound_cpumask(cpumask_var_t cpumask) if (!zalloc_cpumask_var(&saved_cpumask, GFP_KERNEL)) return -ENOMEM; - /* - * Not excluding isolated cpus on purpose. - * If the user wishes to include them, we allow that. - */ cpumask_and(cpumask, cpumask, cpu_possible_mask); if (!cpumask_empty(cpumask)) { apply_wqattrs_lock(); @@ -5583,7 +5579,7 @@ int __init workqueue_init_early(void) WARN_ON(__alignof__(struct pool_workqueue) < __alignof__(long long)); BUG_ON(!alloc_cpumask_var(&wq_unbound_cpumask, GFP_KERNEL)); - cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map); + cpumask_copy(wq_unbound_cpumask, cpu_possible_mask); pwq_cache = KMEM_CACHE(pool_workqueue, SLAB_PANIC); |