summaryrefslogtreecommitdiffstats
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
authorWanpeng Li2014-11-05 02:14:37 +0100
committerIngo Molnar2014-11-16 10:58:55 +0100
commit6c1d9410f007a26d13173cf17204cfd965f49b83 (patch)
treeea09909badbde3bcdc9a0adf194cebb70e8dad2f /kernel/sched/core.c
parentsched/completion: Document when to use wait_for_completion_io_*() (diff)
downloadkernel-qcow2-linux-6c1d9410f007a26d13173cf17204cfd965f49b83.tar.gz
kernel-qcow2-linux-6c1d9410f007a26d13173cf17204cfd965f49b83.tar.xz
kernel-qcow2-linux-6c1d9410f007a26d13173cf17204cfd965f49b83.zip
sched: Move p->nr_cpus_allowed check to select_task_rq()
Move the p->nr_cpus_allowed check into kernel/sched/core.c: select_task_rq(). This change will make fair.c, rt.c, and deadline.c all start with the same logic. Suggested-and-Acked-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: "pang.xunlei" <pang.xunlei@linaro.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/1415150077-59053-1-git-send-email-wanpeng.li@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3ccdce13484c..d44d0c59122b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1411,7 +1411,8 @@ out:
static inline
int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
{
- cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);
+ if (p->nr_cpus_allowed > 1)
+ cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);
/*
* In order not to call set_task_cpu() on a blocking task we need