diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-04 22:10:38 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-04 22:10:38 (GMT) |
commit | 3eef2455f350708269fe42fab07b8c73efca83dc (patch) | |
tree | 839e3585507d0bcceb8d4bdfff7dad56547fda22 /drivers/cpuidle/governors/menu.c | |
parent | f3fe8bd7b114d88c802616a98a0cf69299c37ed3 (diff) | |
parent | ac34d7c8c87c247db0270285950753da045acaad (diff) | |
download | linux-fsl-qoriq-3eef2455f350708269fe42fab07b8c73efca83dc.tar.xz |
Merge branch 'pm-cpuidle'
By Sivaram Nair (2) and others
* pm-cpuidle:
cpuidle: fix lock contention in the idle path
intel_idle: pr_debug information need separated
cpuidle / coupled: fix ready counter decrement
cpuidle: Fix finding state with min power_usage
Diffstat (limited to 'drivers/cpuidle/governors/menu.c')
-rw-r--r-- | drivers/cpuidle/governors/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c index bd40b94..20ea33a 100644 --- a/drivers/cpuidle/governors/menu.c +++ b/drivers/cpuidle/governors/menu.c @@ -312,7 +312,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) { struct menu_device *data = &__get_cpu_var(menu_devices); int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY); - int power_usage = -1; + int power_usage = INT_MAX; int i; int multiplier; struct timespec t; |