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

Commit b75cac93 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Tejun Heo
Browse files

workqueue: correct req_cpu in trace_workqueue_queue_work() 



When we do tracing workqueue_queue_work(), it records requested cpu.
But, if !(@wq->flag & WQ_UNBOUND) and @cpu is WORK_CPU_UNBOUND,
requested cpu is changed as local cpu.
In case of @wq->flag & WQ_UNBOUND, above change is not occured,
therefore it is reasonable to correct it.

Use temporary local variable for storing requested cpu.

Signed-off-by: default avatarJoonsoo Kim <js1304@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 330dad5b

kernel/workqueue.c

+2 −1
Original line number Diff line number Diff line
@@ -1198,6 +1198,7 @@ static void __queue_work(unsigned int cpu, struct workqueue_struct *wq, 
	struct cpu_workqueue_struct *cwq;

	struct list_head *worklist;

	unsigned int work_flags;

	unsigned int req_cpu = cpu;



	/*

	 * While a work item is PENDING && off queue, a task trying to
@@ -1253,7 +1254,7 @@ static void __queue_work(unsigned int cpu, struct workqueue_struct *wq, 


	/* gcwq determined, get cwq and queue */

	cwq = get_cwq(gcwq->cpu, wq);

	trace_workqueue_queue_work(cpu, cwq, work);

	trace_workqueue_queue_work(req_cpu, cwq, work);



	if (WARN_ON(!list_empty(&work->entry))) {

		spin_unlock(&gcwq->lock);