1 files changed, 10 insertions, 10 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2acdf19c5f7c..ef5bbf760a08 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -981,7 +981,7 @@ static struct rq *__migrate_task(struct rq *rq, struct task_struct *p, int dest_
                 return rq;
 
         /* Affinity changed (again). */
-        if (!cpumask_test_cpu(dest_cpu, tsk_cpus_allowed(p)))
+        if (!cpumask_test_cpu(dest_cpu, &p->cpus_allowed))
                 return rq;
 
         rq = move_queued_task(rq, p, dest_cpu);
@@ -1259,10 +1259,10 @@ static int migrate_swap_stop(void *data)
         if (task_cpu(arg->src_task) != arg->src_cpu)
                 goto unlock;
 
-        if (!cpumask_test_cpu(arg->dst_cpu, tsk_cpus_allowed(arg->src_task)))
+        if (!cpumask_test_cpu(arg->dst_cpu, &arg->src_task->cpus_allowed))
                 goto unlock;
 
-        if (!cpumask_test_cpu(arg->src_cpu, tsk_cpus_allowed(arg->dst_task)))
+        if (!cpumask_test_cpu(arg->src_cpu, &arg->dst_task->cpus_allowed))
                 goto unlock;
 
         __migrate_swap_task(arg->src_task, arg->dst_cpu);
@@ -1303,10 +1303,10 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p)
         if (!cpu_active(arg.src_cpu) || !cpu_active(arg.dst_cpu))
                 goto out;
 
-        if (!cpumask_test_cpu(arg.dst_cpu, tsk_cpus_allowed(arg.src_task)))
+        if (!cpumask_test_cpu(arg.dst_cpu, &arg.src_task->cpus_allowed))
                 goto out;
 
-        if (!cpumask_test_cpu(arg.src_cpu, tsk_cpus_allowed(arg.dst_task)))
+        if (!cpumask_test_cpu(arg.src_cpu, &arg.dst_task->cpus_allowed))
                 goto out;
 
         trace_sched_swap_numa(cur, arg.src_cpu, p, arg.dst_cpu);
@@ -1490,14 +1490,14 @@ static int select_fallback_rq(int cpu, struct task_struct *p)
                 for_each_cpu(dest_cpu, nodemask) {
                         if (!cpu_active(dest_cpu))
                                 continue;
-                        if (cpumask_test_cpu(dest_cpu, tsk_cpus_allowed(p)))
+                        if (cpumask_test_cpu(dest_cpu, &p->cpus_allowed))
                                 return dest_cpu;
                 }
         }
 
         for (;;) {
                 /* Any allowed, online CPU? */
-                for_each_cpu(dest_cpu, tsk_cpus_allowed(p)) {
+                for_each_cpu(dest_cpu, &p->cpus_allowed) {
                         if (!(p->flags & PF_KTHREAD) && !cpu_active(dest_cpu))
                                 continue;
                         if (!cpu_online(dest_cpu))
@@ -1552,7 +1552,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
         if (tsk_nr_cpus_allowed(p) > 1)
                 cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);
         else
-                cpu = cpumask_any(tsk_cpus_allowed(p));
+                cpu = cpumask_any(&p->cpus_allowed);
 
         /*
          * In order not to call set_task_cpu() on a blocking task we need
@@ -1564,7 +1564,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
          * [ this allows ->select_task() to simply return task_cpu(p) and
          *   not worry about this generic constraint ]
          */
-        if (unlikely(!cpumask_test_cpu(cpu, tsk_cpus_allowed(p)) ||
+        if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
                      !cpu_online(cpu)))
                 cpu = select_fallback_rq(task_cpu(p), p);
 
@@ -5473,7 +5473,7 @@ int migrate_task_to(struct task_struct *p, int target_cpu)
         if (curr_cpu == target_cpu)
                 return 0;
 
-        if (!cpumask_test_cpu(target_cpu, tsk_cpus_allowed(p)))
+        if (!cpumask_test_cpu(target_cpu, &p->cpus_allowed))
                 return -EINVAL;
 
         /* TODO: This is not properly updating schedstats */