59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Mon, 18 Jan 2016 17:10:39 +0100
|
|
Subject: sched: use tsk_cpus_allowed() instead of accessing
|
|
->cpus_allowed
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.6/older/patches-4.6.2-rt5.tar.xz
|
|
|
|
Use the future-safe accessor for struct task_struct's.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/sched/cpudeadline.c | 4 ++--
|
|
kernel/sched/cpupri.c | 4 ++--
|
|
kernel/sched/deadline.c | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/kernel/sched/cpudeadline.c
|
|
+++ b/kernel/sched/cpudeadline.c
|
|
@@ -103,10 +103,10 @@ int cpudl_find(struct cpudl *cp, struct
|
|
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)
|
|
--- a/kernel/sched/cpupri.c
|
|
+++ b/kernel/sched/cpupri.c
|
|
@@ -103,11 +103,11 @@ int cpupri_find(struct cpupri *cp, struc
|
|
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
|
|
--- a/kernel/sched/deadline.c
|
|
+++ b/kernel/sched/deadline.c
|
|
@@ -1392,7 +1392,7 @@ static struct rq *find_lock_later_rq(str
|
|
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))) {
|