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

Commit ade42e09 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

sched/core: Use tsk_cpus_allowed() instead of accessing ->cpus_allowed 



Use the future-safe accessor for struct task_struct's.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1462969411-17735-1-git-send-email-bigeasy@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 20878232

kernel/sched/cpudeadline.c

+2 −2
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p, 
	const struct sched_dl_entity *dl_se = &p->dl;



	if (later_mask &&

	    cpumask_and(later_mask, cp->free_cpus, &p->cpus_allowed)) {

	    cpumask_and(later_mask, cp->free_cpus, tsk_cpus_allowed(p))) {

		best_cpu = cpumask_any(later_mask);

		goto out;

	} else if (cpumask_test_cpu(cpudl_maximum(cp), &p->cpus_allowed) &&

	} else if (cpumask_test_cpu(cpudl_maximum(cp), tsk_cpus_allowed(p)) &&

			dl_time_before(dl_se->deadline, cp->elements[0].dl)) {

		best_cpu = cpudl_maximum(cp);

		if (later_mask)

kernel/sched/cpupri.c

+2 −2
Original line number Diff line number Diff line
@@ -103,11 +103,11 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p, 
		if (skip)

			continue;



		if (cpumask_any_and(&p->cpus_allowed, vec->mask) >= nr_cpu_ids)

		if (cpumask_any_and(tsk_cpus_allowed(p), vec->mask) >= nr_cpu_ids)

			continue;



		if (lowest_mask) {

			cpumask_and(lowest_mask, &p->cpus_allowed, vec->mask);

			cpumask_and(lowest_mask, tsk_cpus_allowed(p), vec->mask);



			/*

			 * We have to ensure that we have at least one bit

kernel/sched/deadline.c

+1 −1
Original line number Diff line number Diff line
@@ -1393,7 +1393,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) 
		if (double_lock_balance(rq, later_rq)) {

			if (unlikely(task_rq(task) != rq ||

				     !cpumask_test_cpu(later_rq->cpu,

				                       &task->cpus_allowed) ||

						       tsk_cpus_allowed(task)) ||

				     task_running(rq, task) ||

				     !dl_task(task) ||

				     !task_on_rq_queued(task))) {