diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 07:52:00 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 07:52:00 -0500 |
commit | 4d117c5c6b00254e51c61ff5b506ccaba21a5a03 (patch) | |
tree | ecb9d3ee4bfd9610c459c1eb0c0357c2905f3ae4 /kernel/sched.c | |
parent | 6c415b9234a8c71f290e5d4fddc467f103f32719 (diff) | |
parent | 43714539eab42b2fa3653ea7bd667b36c2291b11 (diff) |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 4c7388ef5be7..152828239ef0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -1443,7 +1443,7 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd); | |||
1443 | static unsigned long cpu_avg_load_per_task(int cpu) | 1443 | static unsigned long cpu_avg_load_per_task(int cpu) |
1444 | { | 1444 | { |
1445 | struct rq *rq = cpu_rq(cpu); | 1445 | struct rq *rq = cpu_rq(cpu); |
1446 | unsigned long nr_running = rq->nr_running; | 1446 | unsigned long nr_running = ACCESS_ONCE(rq->nr_running); |
1447 | 1447 | ||
1448 | if (nr_running) | 1448 | if (nr_running) |
1449 | rq->avg_load_per_task = rq->load.weight / nr_running; | 1449 | rq->avg_load_per_task = rq->load.weight / nr_running; |