From bcb8af32c89c2b6fbac871d4ec4879dd1b4bdbb0 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 11 Sep 2009 12:45:38 +0200 Subject: [PATCH] --- yaml --- r: 163001 b: refs/heads/master c: d7c33c4930f569caf6b2ece597432853c4151a45 h: refs/heads/master i: 162999: 07a47f9da976cfe523f7f413ca7551fdc0613a4c v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dbb26f8db94b..d35030c7c0b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83f54960c11a14942ab00b54c51e91906b9d8235 +refs/heads/master: d7c33c4930f569caf6b2ece597432853c4151a45 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 43dc6d1d9e88..8b3eddbcf9a4 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1318,7 +1318,6 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu) */ static int select_task_rq_fair(struct task_struct *p, int flag, int sync) { - struct task_struct *t = current; struct sched_domain *tmp, *sd = NULL; int cpu = smp_processor_id(); int prev_cpu = task_cpu(p); @@ -1393,13 +1392,13 @@ static int select_task_rq_fair(struct task_struct *p, int flag, int sync) continue; } - group = find_idlest_group(sd, t, cpu); + group = find_idlest_group(sd, p, cpu); if (!group) { sd = sd->child; continue; } - new_cpu = find_idlest_cpu(group, t, cpu); + new_cpu = find_idlest_cpu(group, p, cpu); if (new_cpu == -1 || new_cpu == cpu) { /* Now try balancing at a lower domain level of cpu */ sd = sd->child;