diff options
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index f4feacad3812..81f2457811eb 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -251,8 +251,8 @@ EXPORT_SYMBOL_GPL(system_freezable_wq); | |||
| 251 | for ((pool) = &std_worker_pools(cpu)[0]; \ | 251 | for ((pool) = &std_worker_pools(cpu)[0]; \ |
| 252 | (pool) < &std_worker_pools(cpu)[NR_STD_WORKER_POOLS]; (pool)++) | 252 | (pool) < &std_worker_pools(cpu)[NR_STD_WORKER_POOLS]; (pool)++) |
| 253 | 253 | ||
| 254 | #define for_each_busy_worker(worker, i, pos, pool) \ | 254 | #define for_each_busy_worker(worker, i, pool) \ |
| 255 | hash_for_each(pool->busy_hash, i, pos, worker, hentry) | 255 | hash_for_each(pool->busy_hash, i, worker, hentry) |
| 256 | 256 | ||
| 257 | static inline int __next_wq_cpu(int cpu, const struct cpumask *mask, | 257 | static inline int __next_wq_cpu(int cpu, const struct cpumask *mask, |
| 258 | unsigned int sw) | 258 | unsigned int sw) |
| @@ -909,9 +909,8 @@ static struct worker *find_worker_executing_work(struct worker_pool *pool, | |||
| 909 | struct work_struct *work) | 909 | struct work_struct *work) |
| 910 | { | 910 | { |
| 911 | struct worker *worker; | 911 | struct worker *worker; |
| 912 | struct hlist_node *tmp; | ||
| 913 | 912 | ||
| 914 | hash_for_each_possible(pool->busy_hash, worker, tmp, hentry, | 913 | hash_for_each_possible(pool->busy_hash, worker, hentry, |
| 915 | (unsigned long)work) | 914 | (unsigned long)work) |
| 916 | if (worker->current_work == work && | 915 | if (worker->current_work == work && |
| 917 | worker->current_func == work->func) | 916 | worker->current_func == work->func) |
| @@ -1626,7 +1625,6 @@ static void busy_worker_rebind_fn(struct work_struct *work) | |||
| 1626 | static void rebind_workers(struct worker_pool *pool) | 1625 | static void rebind_workers(struct worker_pool *pool) |
| 1627 | { | 1626 | { |
| 1628 | struct worker *worker, *n; | 1627 | struct worker *worker, *n; |
| 1629 | struct hlist_node *pos; | ||
| 1630 | int i; | 1628 | int i; |
| 1631 | 1629 | ||
| 1632 | lockdep_assert_held(&pool->assoc_mutex); | 1630 | lockdep_assert_held(&pool->assoc_mutex); |
| @@ -1648,7 +1646,7 @@ static void rebind_workers(struct worker_pool *pool) | |||
| 1648 | } | 1646 | } |
| 1649 | 1647 | ||
| 1650 | /* rebind busy workers */ | 1648 | /* rebind busy workers */ |
| 1651 | for_each_busy_worker(worker, i, pos, pool) { | 1649 | for_each_busy_worker(worker, i, pool) { |
| 1652 | struct work_struct *rebind_work = &worker->rebind_work; | 1650 | struct work_struct *rebind_work = &worker->rebind_work; |
| 1653 | struct workqueue_struct *wq; | 1651 | struct workqueue_struct *wq; |
| 1654 | 1652 | ||
| @@ -3423,7 +3421,6 @@ static void wq_unbind_fn(struct work_struct *work) | |||
| 3423 | int cpu = smp_processor_id(); | 3421 | int cpu = smp_processor_id(); |
| 3424 | struct worker_pool *pool; | 3422 | struct worker_pool *pool; |
| 3425 | struct worker *worker; | 3423 | struct worker *worker; |
| 3426 | struct hlist_node *pos; | ||
| 3427 | int i; | 3424 | int i; |
| 3428 | 3425 | ||
| 3429 | for_each_std_worker_pool(pool, cpu) { | 3426 | for_each_std_worker_pool(pool, cpu) { |
| @@ -3442,7 +3439,7 @@ static void wq_unbind_fn(struct work_struct *work) | |||
| 3442 | list_for_each_entry(worker, &pool->idle_list, entry) | 3439 | list_for_each_entry(worker, &pool->idle_list, entry) |
| 3443 | worker->flags |= WORKER_UNBOUND; | 3440 | worker->flags |= WORKER_UNBOUND; |
| 3444 | 3441 | ||
| 3445 | for_each_busy_worker(worker, i, pos, pool) | 3442 | for_each_busy_worker(worker, i, pool) |
| 3446 | worker->flags |= WORKER_UNBOUND; | 3443 | worker->flags |= WORKER_UNBOUND; |
| 3447 | 3444 | ||
| 3448 | pool->flags |= POOL_DISASSOCIATED; | 3445 | pool->flags |= POOL_DISASSOCIATED; |
