2 files changed, 8 insertions, 5 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index f3030709d826..61452e86c73b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5522,8 +5522,15 @@ again:
                 goto out;
 
         yielded = curr->sched_class->yield_to_task(rq, p, preempt);
-        if (yielded)
+        if (yielded) {
                 schedstat_inc(rq, yld_count);
+                /*
+                 * Make p's CPU reschedule; pick_next_entity takes care of
+                 * fairness.
+                 */
+                if (preempt && rq != p_rq)
+                        resched_task(p_rq->curr);
+        }
 
 out:
         double_rq_unlock(rq, p_rq);
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 1438e13cf8be..3f7ec9e27ee1 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1987,10 +1987,6 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp
         /* Tell the scheduler that we'd really like pse to run next. */
         set_next_buddy(se);
 
-        /* Make p's CPU reschedule; pick_next_entity takes care of fairness. */
-        if (preempt)
-                resched_task(rq->curr);
-
         yield_task_fair(rq);
 
         return true;