Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1d9410 authored by Wanpeng Li's avatar Wanpeng Li Committed by Ingo Molnar
Browse files

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: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarWanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent a1bd5373

kernel/sched/core.c

+2 −1
Original line number Diff line number Diff line
@@ -1411,6 +1411,7 @@ static int select_fallback_rq(int cpu, struct task_struct *p) 
static inline

int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)

{

	if (p->nr_cpus_allowed > 1)

		cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);



	/*

kernel/sched/deadline.c

+0 −3
Original line number Diff line number Diff line
@@ -928,9 +928,6 @@ select_task_rq_dl(struct task_struct *p, int cpu, int sd_flag, int flags) 
	struct task_struct *curr;

	struct rq *rq;



	if (p->nr_cpus_allowed == 1)

		goto out;



	if (sd_flag != SD_BALANCE_WAKE)

		goto out;

kernel/sched/fair.c

+0 −3
Original line number Diff line number Diff line
@@ -4730,9 +4730,6 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f 
	int want_affine = 0;

	int sync = wake_flags & WF_SYNC;



	if (p->nr_cpus_allowed == 1)

		return prev_cpu;



	if (sd_flag & SD_BALANCE_WAKE)

		want_affine = cpumask_test_cpu(cpu, tsk_cpus_allowed(p));

kernel/sched/rt.c

+0 −3
Original line number Diff line number Diff line
@@ -1301,9 +1301,6 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) 
	struct task_struct *curr;

	struct rq *rq;



	if (p->nr_cpus_allowed == 1)

		goto out;



	/* For anything but wake ups, just return the task_cpu */

	if (sd_flag != SD_BALANCE_WAKE && sd_flag != SD_BALANCE_FORK)

		goto out;