From 35d0993843079374f239fc2780e5936a79f9215f Mon Sep 17 00:00:00 2001 From: Boris Ostrovsky Date: Tue, 13 Mar 2012 19:55:10 +0100 Subject: [PATCH] --- yaml --- r: 298023 b: refs/heads/master c: 02401c06b7f6bec65f314e3cec7894502c973501 h: refs/heads/master i: 298021: 385fcd85597142f61d5b563b9d0e4f3a30012397 298019: 11a68d5bf30fca026527e7b797eaae4d0c792a2d 298015: 97bf5f8aee8e732fc169bbe6a5d583b6b827a526 v: v3 --- [refs] | 2 +- trunk/drivers/cpuidle/governors/menu.c | 2 +- trunk/include/linux/cpuidle.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 93c3721fc5fb..9b3b40ff290b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a022e3f1be11730bd8747b1af96a0274bf6356e +refs/heads/master: 02401c06b7f6bec65f314e3cec7894502c973501 diff --git a/trunk/drivers/cpuidle/governors/menu.c b/trunk/drivers/cpuidle/governors/menu.c index 5c17ca112fc2..06335756ea14 100644 --- a/trunk/drivers/cpuidle/governors/menu.c +++ b/trunk/drivers/cpuidle/governors/menu.c @@ -236,7 +236,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); - unsigned int power_usage = -1; + int power_usage = -1; int i; int multiplier; struct timespec t; diff --git a/trunk/include/linux/cpuidle.h b/trunk/include/linux/cpuidle.h index d557bcd0ada7..6c26a3da0e03 100644 --- a/trunk/include/linux/cpuidle.h +++ b/trunk/include/linux/cpuidle.h @@ -44,7 +44,7 @@ struct cpuidle_state { unsigned int flags; unsigned int exit_latency; /* in US */ - unsigned int power_usage; /* in mW */ + int power_usage; /* in mW */ unsigned int target_residency; /* in US */ unsigned int disable;