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

Commit e7b55b8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull workqueue changes from Tejun Heo:
 "Nothing exciting.  Just two trivial changes."

* 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: add WARN_ON_ONCE() on CPU number to wq_worker_waking_up()
  workqueue: trivial fix for return statement in work_busy()
parents 50851c62 36576000

kernel/workqueue.c

+4 −2
Original line number Diff line number Diff line
@@ -739,9 +739,11 @@ void wq_worker_waking_up(struct task_struct *task, unsigned int cpu) 
{

	struct worker *worker = kthread_data(task);



	if (!(worker->flags & WORKER_NOT_RUNNING))

	if (!(worker->flags & WORKER_NOT_RUNNING)) {

		WARN_ON_ONCE(worker->pool->gcwq->cpu != cpu);

		atomic_inc(get_pool_nr_running(worker->pool));

	}

}



/**

 * wq_worker_sleeping - a worker is going to sleep
@@ -3485,7 +3487,7 @@ unsigned int work_busy(struct work_struct *work) 
	unsigned int ret = 0;



	if (!gcwq)

		return false;

		return 0;



	spin_lock_irqsave(&gcwq->lock, flags);