lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into cpus4096

Browse Source 
Conflicts:
	kernel/trace/ring_buffer.c
This commit is contained in:
Ingo Molnar
2008-12-02 20:09:50 +01:00
parent 1c39194878 061e41fdb5
commit a64d31baed
286 changed files with 5510 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/sched.c
View File

@ -1439,9 +1439,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 = ACCESS_ONCE(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;