Merge branch 'sched/urgent' into sched/core

This commit is contained in:
Ingo Molnar 2008-12-08 13:52:00 +01:00
commit 4d117c5c6b
208 changed files with 4527 additions and 2284 deletions

View file

@ -1443,7 +1443,7 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
static unsigned long cpu_avg_load_per_task(int cpu)
{
struct rq *rq = cpu_rq(cpu);
unsigned long nr_running = rq->nr_running;
unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
if (nr_running)
rq->avg_load_per_task = rq->load.weight / nr_running;