]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Revert "workqueue: respect isolated cpus when queueing an unbound work"
authorTejun Heo <tj@kernel.org>
Fri, 3 Nov 2017 14:02:15 +0000 (07:02 -0700)
committerTejun Heo <tj@kernel.org>
Fri, 3 Nov 2017 14:02:15 +0000 (07:02 -0700)
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>
kernel/workqueue.c

index bfa433b38a617e6fb86f2f077a93870ea37dc354..64d0edf428f850f2e5cfed94970cb74491eb6b61 100644 (file)
@@ -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);