diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-03 19:07:21 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-03 19:07:21 +0200 |
| commit | e3b8cdd8e4ea51e46d3ff54d7e3568afc24654ec (patch) | |
| tree | 0acfb0801d94d7222a752c40fb611dff00280803 /drivers/cpuidle/governors/menu.c | |
| parent | 80de3d7f416f1accd03f2e519ead32d6fde4fcf4 (diff) | |
| parent | 6e797a078824b30afbfae6cc4b1c2b21c51761ef (diff) | |
Merge branch 'pm-cpuidle' into pm-domains
* pm-cpuidle:
PM / cpuidle: Add driver reference counter
cpuidle: move field disable from per-driver to per-cpu
Diffstat (limited to 'drivers/cpuidle/governors/menu.c')
| -rw-r--r-- | drivers/cpuidle/governors/menu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index 06335756ea1..8391d93f57d 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -281,7 +281,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) * unless the timer is happening really really soon. */ if (data->expected_us > 5 && - drv->states[CPUIDLE_DRIVER_STATE_START].disable == 0) + dev->states_usage[CPUIDLE_DRIVER_STATE_START].disable == 0) data->last_state_idx = CPUIDLE_DRIVER_STATE_START; /* @@ -290,8 +290,9 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) */ for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) { struct cpuidle_state *s = &drv->states[i]; + struct cpuidle_state_usage *su = &dev->states_usage[i]; - if (s->disable) + if (su->disable) continue; if (s->target_residency > data->predicted_us) continue; |