diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
| commit | 56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch) | |
| tree | b902491aef3a99efe0d9d49edd0f6e414dba654f /drivers/idle | |
| parent | 2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff) | |
| parent | f878133bf022717b880d0e0995b8f91436fd605c (diff) | |
Merge branch 'linus' into idle-test
Diffstat (limited to 'drivers/idle')
| -rw-r--r-- | drivers/idle/intel_idle.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index fc393586cc7..d14585b2e04 100644 --- 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) | |||
| 231 | kt_before = ktime_get_real(); | 231 | kt_before = ktime_get_real(); |
| 232 | 232 | ||
| 233 | stop_critical_timings(); | 233 | stop_critical_timings(); |
| 234 | #ifndef MODULE | ||
| 235 | trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); | 234 | trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); |
| 236 | #endif | 235 | trace_cpu_idle((eax >> 4) + 1, cpu); |
| 237 | if (!need_resched()) { | 236 | if (!need_resched()) { |
| 238 | 237 | ||
| 239 | __monitor((void *)¤t_thread_info()->flags, 0, 0); | 238 | __monitor((void *)¤t_thread_info()->flags, 0, 0); |