tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'v2.6.37-rc6' into sched/core

Browse Source 
Merge reason: Update to the latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-12-19 16:35:08 +01:00
parent 40dc11ffb3 b0c3844d8a
commit ca680888d5
268 changed files with 2194 additions and 1602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/workqueue.c
+4 -3
View File
@@ -661,7 +661,7 @@ void wq_worker_waking_up(struct task_struct *task, unsigned int cpu)
{
struct worker *worker = kthread_data(task);
if (likely(!(worker->flags & WORKER_NOT_RUNNING)))
if (!(worker->flags & WORKER_NOT_RUNNING))
atomic_inc(get_gcwq_nr_running(cpu));
}
@@ -687,7 +687,7 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task,
struct global_cwq *gcwq = get_gcwq(cpu);
atomic_t *nr_running = get_gcwq_nr_running(cpu);
if (unlikely(worker->flags & WORKER_NOT_RUNNING))
if (worker->flags & WORKER_NOT_RUNNING)
return NULL;
/* this can only happen on the local cpu */
@@ -3692,7 +3692,8 @@ static int __init init_workqueues(void)
system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0);
system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,
WQ_UNBOUND_MAX_ACTIVE);
BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq);
BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq ||
!system_unbound_wq);
return 0;
}
early_initcall(init_workqueues);