summaryrefslogtreecommitdiff
path: root/kernel/sched/idle.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-09-08 17:02:15 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-09-08 17:07:42 -0700
commit341e02d8bbeeda14cfc946ffbcb492dc9823487b (patch)
treea46f6c9f2483a7c3e64730b5dbde202dc2678efc /kernel/sched/idle.c
parenta38338f1cd595f6a66870ba46cc6a4ae7378c084 (diff)
parent81330959ee15a682fbefcdd4f5350a979d8e8fdb (diff)
Merge remote-tracking branch 'linaro-ext/EAS/v4.4-easv5.2+aosp-changes' into android-4.4
Change-Id: Ic24b43ee867bc4f70b31bedaad734717b64b86a1
Diffstat (limited to 'kernel/sched/idle.c')
-rw-r--r--kernel/sched/idle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 4a2ef5a02fd3..917c94abf5bb 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -19,9 +19,10 @@
* sched_idle_set_state - Record idle state for the current CPU.
* @idle_state: State to record.
*/
-void sched_idle_set_state(struct cpuidle_state *idle_state)
+void sched_idle_set_state(struct cpuidle_state *idle_state, int index)
{
idle_set_state(this_rq(), idle_state);
+ idle_set_state_idx(this_rq(), index);
}
static int __read_mostly cpu_idle_force_poll;
@@ -219,6 +220,7 @@ static void cpu_idle_loop(void)
*/
__current_set_polling();
+ quiet_vmstat();
tick_nohz_idle_enter();
while (!need_resched()) {