Merge branches 'idle-fix' and 'misc' into release

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index a71376a45d8e..2f0083a51a9a 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -140,13 +140,13 @@ int cpuidle_idle_call(void)
                 return 0;
         }
 
-        trace_power_start(POWER_CSTATE, next_state, dev->cpu);
-        trace_cpu_idle(next_state, dev->cpu);
+        trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
+        trace_cpu_idle_rcuidle(next_state, dev->cpu);
 
         entered_state = cpuidle_enter_ops(dev, drv, next_state);
 
-        trace_power_end(dev->cpu);
-        trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
+        trace_power_end_rcuidle(dev->cpu);
+        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
 
         if (entered_state >= 0) {
                 /* Update cpuidle counters */
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 5c17ca112fc2..06335756ea14 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/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;