[linux-yocto] [PATCH 47/48] kernel/sched: Revert compile fixes

[Daniel Dragomir]

From: Charlie Paul <cpaul.windriver at gmail.com>

These changes were needed for the kernel to compile after
applying the three previous revert patches.

Signed-off-by: Charlie Paul <cpaul.windriver at gmail.com>
---
 kernel/sched/core.c | 2 +-
 kernel/sched/rt.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 54bbbd9..a7d0587 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1757,7 +1757,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
 {
 	lockdep_assert_held(&p->pi_lock);
 
-	if (tsk_nr_cpus_allowed(p) > 1)
+	if (p->nr_cpus_allowed > 1)
 		cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);
 	else
 		cpu = cpumask_any(tsk_cpus_allowed(p));
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 32be096..701eddf 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2198,7 +2198,7 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p)
 	 */
 	if (task_on_rq_queued(p) && rq->curr != p) {
 #ifdef CONFIG_SMP
-		if (tsk_nr_cpus_allowed(p) > 1 && rq->rt.overloaded)
+		if (p->nr_cpus_allowed > 1 && rq->rt.overloaded)
 			queue_push_tasks(rq);
 #endif /* CONFIG_SMP */
 		if (p->prio < rq->curr->prio)
-- 
2.7.4