diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-20 09:46:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-20 09:46:42 +0200 |
| commit | 4fffe71dd913cca5532da594e2f48a0db6b494dc (patch) | |
| tree | 6e0dc83582382506e8b70760d8b59a50d93bfa5a /kernel/workqueue.c | |
| parent | 4b3b234f434d440fcd749b9636131b76e2ce561e (diff) | |
| parent | 47ef4ad2684d380dd6d596140fb79395115c3950 (diff) | |
| download | cachepc-linux-4fffe71dd913cca5532da594e2f48a0db6b494dc.tar.gz cachepc-linux-4fffe71dd913cca5532da594e2f48a0db6b494dc.zip | |
Merge branch 'linus' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/workqueue.c')
| -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 e1c0e996b5ae..97e7b793df35 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4600,15 +4600,11 @@ static void restore_unbound_workers_cpumask(struct worker_pool *pool, int cpu) if (!cpumask_test_cpu(cpu, pool->attrs->cpumask)) return; - /* is @cpu the only online CPU? */ cpumask_and(&cpumask, pool->attrs->cpumask, cpu_online_mask); - if (cpumask_weight(&cpumask) != 1) - return; /* as we're called from CPU_ONLINE, the following shouldn't fail */ for_each_pool_worker(worker, pool) - WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, - pool->attrs->cpumask) < 0); + WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, &cpumask) < 0); } /* |