1 files changed, 11 insertions, 11 deletions

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index 039dde2b1dac..2dc2784b196c 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -1727,12 +1727,20 @@ static void start_hrtick_dl(struct rq *rq, struct task_struct *p)
 }
 #endif
 
-static inline void set_next_task(struct rq *rq, struct task_struct *p)
+static void set_next_task_dl(struct rq *rq, struct task_struct *p)
 {
         p->se.exec_start = rq_clock_task(rq);
 
         /* You can't push away the running task */
         dequeue_pushable_dl_task(rq, p);
+
+        if (hrtick_enabled(rq))
+                start_hrtick_dl(rq, p);
+
+        if (rq->curr->sched_class != &dl_sched_class)
+                update_dl_rq_load_avg(rq_clock_pelt(rq), rq, 0);
+
+        deadline_queue_push_tasks(rq);
 }
 
 static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq,
@@ -1791,15 +1799,7 @@ pick_next_task_dl(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 
         p = dl_task_of(dl_se);
 
-        set_next_task(rq, p);
-
-        if (hrtick_enabled(rq))
-                start_hrtick_dl(rq, p);
-
-        deadline_queue_push_tasks(rq);
-
-        if (rq->curr->sched_class != &dl_sched_class)
-                update_dl_rq_load_avg(rq_clock_pelt(rq), rq, 0);
+        set_next_task_dl(rq, p);
 
         return p;
 }
@@ -1846,7 +1846,7 @@ static void task_fork_dl(struct task_struct *p)
 
 static void set_curr_task_dl(struct rq *rq)
 {
-        set_next_task(rq, rq->curr);
+        set_next_task_dl(rq, rq->curr);
 }
 
 #ifdef CONFIG_SMP