Merge branch 'linus' into idle-test

This commit is contained in:
Len Brown 2011-01-12 18:06:06 -05:00
commit 56dbed129d
5511 changed files with 414466 additions and 223180 deletions

View file

@ -231,9 +231,8 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
kt_before = ktime_get_real();
stop_critical_timings();
#ifndef MODULE
trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu);
#endif
trace_cpu_idle((eax >> 4) + 1, cpu);
if (!need_resched()) {
__monitor((void *)&current_thread_info()->flags, 0, 0);