diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-13 14:47:50 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-13 14:47:50 -0700 |
| commit | 441e10ac4ca3a476d76091a1bd250ac4ff7306c5 (patch) | |
| tree | a76b65a8ff5dd552f0582e620b964df0b5026f17 /kernel/sched/idle.c | |
| parent | 2a3670c62203b1a11b496ec6585393b8abf9736f (diff) | |
| parent | 1510827f29ced43ac686c4625ce709e0dfb1292d (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'kernel/sched/idle.c')
| -rw-r--r-- | kernel/sched/idle.c | 4 |
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()) { |