summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCon Kolivas <kernel@kolivas.org>2016-10-22 11:50:43 +1100
committerCon Kolivas <kernel@kolivas.org>2016-10-22 11:52:06 +1100
commit4cb6ca8124af10571691578db554bcebf904a464 (patch)
tree2306cb80d3da4fd6dd46999c9784b977555b9de6
parentbd5abaacb208b0b84274677045817ef6aa2a735f (diff)
Fix incorrect cpu being returned in select_best_cpu which would lead to boot failures.
-rw-r--r--kernel/sched/MuQSS.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/MuQSS.c b/kernel/sched/MuQSS.c
index 1332dc9de595..16ea2eb424c2 100644
--- a/kernel/sched/MuQSS.c
+++ b/kernel/sched/MuQSS.c
@@ -1933,7 +1933,7 @@ static inline int select_best_cpu(struct task_struct *p)
rq = other_rq;
}
if (unlikely(!rq))
- return smp_processor_id();
+ return task_cpu(p);
return rq->cpu;
}
#else /* CONFIG_SMP */