| From | Andrea Arcangeli <> | Subject | [PATCH 20/39] autonuma: avoid CFS select_task_rq_fair to return -1 | Date | Mon, 26 Mar 2012 19:46:07 +0200 |
| |
Fix to avoid -1 retval.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> --- kernel/sched/fair.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 94340c7..25e9e5b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2769,6 +2769,7 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) goto unlock; } + prev_cpu = new_cpu; while (sd) { int load_idx = sd->forkexec_idx; struct sched_group *group; @@ -2792,6 +2793,7 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) if (new_cpu == -1 || new_cpu == cpu) { /* Now try balancing at a lower domain level of cpu */ sd = sd->child; + new_cpu = prev_cpu; continue; } @@ -2810,6 +2812,7 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) unlock: rcu_read_unlock(); + BUG_ON(new_cpu < 0); return new_cpu; } #endif /* CONFIG_SMP */
|