aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-05-09 05:33:50 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-09 15:30:50 -0400
commite18f3ffb9c3ddfc1b4ad8f38f5f2acae8c16f0c9 (patch)
tree6a1ccc7a10ccc25dd9b7e09fefa3db96e211e1ee /kernel
parenta1e3cf418fc1e6b13bdc472ffb60bd02735e41a6 (diff)
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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index b6fa5e63085d..1ea4bcb86974 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -638,7 +638,7 @@ int schedule_on_each_cpu(work_func_t func)
638 if (!works) 638 if (!works)
639 return -ENOMEM; 639 return -ENOMEM;
640 640
641 mutex_lock(&workqueue_mutex); 641 preempt_disable(); /* CPU hotplug */
642 for_each_online_cpu(cpu) { 642 for_each_online_cpu(cpu) {
643 struct work_struct *work = per_cpu_ptr(works, cpu); 643 struct work_struct *work = per_cpu_ptr(works, cpu);
644 644
@@ -646,7 +646,7 @@ int schedule_on_each_cpu(work_func_t func)
646 set_bit(WORK_STRUCT_PENDING, work_data_bits(work)); 646 set_bit(WORK_STRUCT_PENDING, work_data_bits(work));
647 __queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu), work); 647 __queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu), work);
648 } 648 }
649 mutex_unlock(&workqueue_mutex); 649 preempt_enable();
650 flush_workqueue(keventd_wq); 650 flush_workqueue(keventd_wq);
651 free_percpu(works); 651 free_percpu(works);
652 return 0; 652 return 0;