diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-09-11 06:45:38 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 10:01:07 -0400 |
commit | d7c33c4930f569caf6b2ece597432853c4151a45 (patch) | |
tree | 96a0eca96b0109a0dbc2c7a92065cafcf5660718 /kernel | |
parent | 83f54960c11a14942ab00b54c51e91906b9d8235 (diff) |
sched: Fix task affinity for select_task_rq_fair
While merging select_task_rq_fair() and sched_balance_self() I made
a mistake that leads to testing the wrong task affinty.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched_fair.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 43dc6d1d9e88..8b3eddbcf9a4 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -1318,7 +1318,6 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu) | |||
1318 | */ | 1318 | */ |
1319 | static int select_task_rq_fair(struct task_struct *p, int flag, int sync) | 1319 | static int select_task_rq_fair(struct task_struct *p, int flag, int sync) |
1320 | { | 1320 | { |
1321 | struct task_struct *t = current; | ||
1322 | struct sched_domain *tmp, *sd = NULL; | 1321 | struct sched_domain *tmp, *sd = NULL; |
1323 | int cpu = smp_processor_id(); | 1322 | int cpu = smp_processor_id(); |
1324 | int prev_cpu = task_cpu(p); | 1323 | int prev_cpu = task_cpu(p); |
@@ -1393,13 +1392,13 @@ static int select_task_rq_fair(struct task_struct *p, int flag, int sync) | |||
1393 | continue; | 1392 | continue; |
1394 | } | 1393 | } |
1395 | 1394 | ||
1396 | group = find_idlest_group(sd, t, cpu); | 1395 | group = find_idlest_group(sd, p, cpu); |
1397 | if (!group) { | 1396 | if (!group) { |
1398 | sd = sd->child; | 1397 | sd = sd->child; |
1399 | continue; | 1398 | continue; |
1400 | } | 1399 | } |
1401 | 1400 | ||
1402 | new_cpu = find_idlest_cpu(group, t, cpu); | 1401 | new_cpu = find_idlest_cpu(group, p, cpu); |
1403 | if (new_cpu == -1 || new_cpu == cpu) { | 1402 | if (new_cpu == -1 || new_cpu == cpu) { |
1404 | /* Now try balancing at a lower domain level of cpu */ | 1403 | /* Now try balancing at a lower domain level of cpu */ |
1405 | sd = sd->child; | 1404 | sd = sd->child; |