diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2b2593f08989..970e6cd72690 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7421,11 +7421,6 @@ static bool dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) return true; } -static inline unsigned int cfs_h_nr_delayed(struct rq *rq) -{ - return (rq->cfs.h_nr_queued - rq->cfs.h_nr_runnable); -} - #ifdef CONFIG_SMP /* Working cpumask for: sched_balance_rq(), sched_balance_newidle(). */ @@ -7587,12 +7582,8 @@ wake_affine_idle(int this_cpu, int prev_cpu, int sync) if (available_idle_cpu(this_cpu) && cpus_share_cache(this_cpu, prev_cpu)) return available_idle_cpu(prev_cpu) ? prev_cpu : this_cpu; - if (sync) { - struct rq *rq = cpu_rq(this_cpu); - - if ((rq->nr_running - cfs_h_nr_delayed(rq)) == 1) - return this_cpu; - } + if (sync && cpu_rq(this_cpu)->nr_running == 1) + return this_cpu; if (available_idle_cpu(prev_cpu)) return prev_cpu;