1 files changed, 11 insertions, 0 deletions

diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 7a27ef6308c0..9de5f18b92bf 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -1030,6 +1030,17 @@ static int select_task_rq_rt(struct task_struct *p, int sd_flag, int flags)
         }
 
         /*
+         * If the new task is an RT task, current is not an RT task
+         * and the new one may run on the current CPU, run it here.
+         * This avoids sending reschedule IPIs across CPUs.
+         */
+        if (unlikely(rt_task(p)) && !rt_task(rq->curr)) {
+                int cpu = smp_processor_id();
+                if (cpumask_test_cpu(cpu, &p->cpus_allowed))
+                        return cpu;
+        }
+
+        /*
          * Otherwise, just let it ride on the affined RQ and the
          * post-schedule router will push the preempted task away
          */