1 files changed, 15 insertions, 12 deletions

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 80940939b733..54194d41035c 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -374,14 +374,25 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int fl
         resched_curr(rq);
 }
 
+static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
+{
+}
+
+static void set_next_task_idle(struct rq *rq, struct task_struct *next)
+{
+        update_idle_core(rq);
+        schedstat_inc(rq->sched_goidle);
+}
+
 static struct task_struct *
 pick_next_task_idle(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 {
+        struct task_struct *next = rq->idle;
+
         put_prev_task(rq, prev);
-        update_idle_core(rq);
-        schedstat_inc(rq->sched_goidle);
+        set_next_task_idle(rq, next);
 
-        return rq->idle;
+        return next;
 }
 
 /*
@@ -397,10 +408,6 @@ dequeue_task_idle(struct rq *rq, struct task_struct *p, int flags)
         raw_spin_lock_irq(&rq->lock);
 }
 
-static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
-{
-}
-
 /*
  * scheduler tick hitting a task of our scheduling class.
  *
@@ -413,10 +420,6 @@ static void task_tick_idle(struct rq *rq, struct task_struct *curr, int queued)
 {
 }
 
-static void set_curr_task_idle(struct rq *rq)
-{
-}
-
 static void switched_to_idle(struct rq *rq, struct task_struct *p)
 {
         BUG();
@@ -451,13 +454,13 @@ const struct sched_class idle_sched_class = {
 
         .pick_next_task         = pick_next_task_idle,
         .put_prev_task          = put_prev_task_idle,
+        .set_next_task          = set_next_task_idle,
 
 #ifdef CONFIG_SMP
         .select_task_rq         = select_task_rq_idle,
         .set_cpus_allowed       = set_cpus_allowed_common,
 #endif
 
-        .set_curr_task          = set_curr_task_idle,
         .task_tick              = task_tick_idle,
 
         .get_rr_interval        = get_rr_interval_idle,