forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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()
This commit is contained in:
Linus Torvalds 2012-12-12 08:15:13 -08:00
commit e7b55b8fcd
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/workqueue.c
View file

@ -739,8 +739,10 @@ void wq_worker_waking_up(struct task_struct *task, unsigned int cpu)
{ {
struct worker *worker = kthread_data(task); 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)); atomic_inc(get_pool_nr_running(worker->pool));
}
} }
/** /**
@ -3485,7 +3487,7 @@ unsigned int work_busy(struct work_struct *work)
unsigned int ret = 0; unsigned int ret = 0;
if (!gcwq) if (!gcwq)
return false; return 0;
spin_lock_irqsave(&gcwq->lock, flags); spin_lock_irqsave(&gcwq->lock, flags);