1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index cb91c63b4f4a..811edb77dd6d 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1714,9 +1714,7 @@ static struct worker *create_worker(struct worker_pool *pool)
                 goto fail;
 
         set_user_nice(worker->task, pool->attrs->nice);
-
-        /* prevent userland from meddling with cpumask of workqueue workers */
-        worker->task->flags |= PF_NO_SETAFFINITY;
+        kthread_bind_mask(worker->task, pool->attrs->cpumask);
 
         /* successful, attach the worker to the pool */
         worker_attach_to_pool(worker, pool);
@@ -3856,7 +3854,7 @@ struct workqueue_struct *__alloc_workqueue_key(const char *fmt,
                 }
 
                 wq->rescuer = rescuer;
-                rescuer->task->flags |= PF_NO_SETAFFINITY;
+                kthread_bind_mask(rescuer->task, cpu_possible_mask);
                 wake_up_process(rescuer->task);
         }