Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/workqueue.c

+2 −2
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ int schedule_on_each_cpu(work_func_t func) 
	if (!works)

		return -ENOMEM;



	mutex_lock(&workqueue_mutex);

	preempt_disable();		/* CPU hotplug */

	for_each_online_cpu(cpu) {

		struct work_struct *work = per_cpu_ptr(works, cpu);
@@ -646,7 +646,7 @@ int schedule_on_each_cpu(work_func_t func) 
		set_bit(WORK_STRUCT_PENDING, work_data_bits(work));

		__queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu), work);

	}

	mutex_unlock(&workqueue_mutex);

	preempt_enable();

	flush_workqueue(keventd_wq);

	free_percpu(works);

	return 0;