Commit e18f3ffb authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

schedule_on_each_cpu(): use preempt_disable()

We take workqueue_mutex in there to keep CPU hotplug away.  But
preempt_disable() will suffice for that.

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1e3cf41
...@@ -638,7 +638,7 @@ int schedule_on_each_cpu(work_func_t func) ...@@ -638,7 +638,7 @@ int schedule_on_each_cpu(work_func_t func)
if (!works) if (!works)
return -ENOMEM; return -ENOMEM;
mutex_lock(&workqueue_mutex); preempt_disable(); /* CPU hotplug */
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
struct work_struct *work = per_cpu_ptr(works, cpu); struct work_struct *work = per_cpu_ptr(works, cpu);
...@@ -646,7 +646,7 @@ int schedule_on_each_cpu(work_func_t func) ...@@ -646,7 +646,7 @@ int schedule_on_each_cpu(work_func_t func)
set_bit(WORK_STRUCT_PENDING, work_data_bits(work)); set_bit(WORK_STRUCT_PENDING, work_data_bits(work));
__queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu), work); __queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu), work);
} }
mutex_unlock(&workqueue_mutex); preempt_enable();
flush_workqueue(keventd_wq); flush_workqueue(keventd_wq);
free_percpu(works); free_percpu(works);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment