Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / kernel / sched / idle_task.c

diff --git a/kernel/sched/idle_task.c b/kernel/sched/idle_task.c
index 2ce5458bbe1d1ad82c16f7cbe38d79c23f91ebb0..0c00172db63e7fa767179c8d6ac31c7573d5870d 100644 (file)
--- a/kernel/sched/idle_task.c
+++ b/kernel/sched/idle_task.c
@@ -24,11 +24,11 @@ static void check_preempt_curr_idle(struct rq *rq, struct task_struct *p, int fl
 }
 
 static struct task_struct *
-pick_next_task_idle(struct rq *rq, struct task_struct *prev, struct pin_cookie cookie)
+pick_next_task_idle(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 {
        put_prev_task(rq, prev);
-
-       schedstat_inc(rq, sched_goidle);
+       update_idle_core(rq);
+       schedstat_inc(rq->sched_goidle);
        return rq->idle;
 }