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

This commit is contained in:
Len Brown
2012-04-06 21:48:59 -04:00
10325 changed files with 497504 additions and 288659 deletions

View File

@@ -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 */