git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
64b7482
)
Merge branch 'sched/urgent' into sched/core
author
Ingo Molnar
<mingo@elte.hu>
Fri, 28 Nov 2008 19:11:05 +0000
(20:11 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 28 Nov 2008 19:11:05 +0000
(20:11 +0100)
kernel/sched.c
patch
|
blob
|
history
diff --git
a/kernel/sched.c
b/kernel/sched.c
index
338340a
..
3d1ee42
100644
(file)
--- a/
kernel/sched.c
+++ b/
kernel/sched.c
@@
-1433,9
+1433,10
@@
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;
- if (
rq->
nr_running)
- rq->avg_load_per_task = rq->load.weight /
rq->
nr_running;
+ if (nr_running)
+ rq->avg_load_per_task = rq->load.weight / nr_running;
else
rq->avg_load_per_task = 0;