Merge branch 'linus' into idle-test

2011-01-12 18:06:06 -05:00
parent 2a2d31c8dc f878133bf0
commit 56dbed129d
5511 changed files with 415253 additions and 223967 deletions
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -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);