diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:19 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:19 -0500 |
| commit | 43952886f0b8b3c344c3392b88de067d5fa5419a (patch) | |
| tree | c1a738f11a479246c09976902be5b73aaf731722 /drivers/idle | |
| parent | 56dbed129df3fdd4caf9018b6e7599ee258a5420 (diff) | |
| parent | f77cfe4ea21760268c0277fa3e4b02dfd2a2c2f4 (diff) | |
Merge branch 'cpuidle-perf-events' into idle-test
Diffstat (limited to 'drivers/idle')
| -rw-r--r-- | drivers/idle/intel_idle.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index d14585b2e045..7acb32e7f817 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -231,8 +231,6 @@ 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 | trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu); | ||
| 235 | trace_cpu_idle((eax >> 4) + 1, cpu); | ||
| 236 | if (!need_resched()) { | 234 | if (!need_resched()) { |
| 237 | 235 | ||
| 238 | __monitor((void *)¤t_thread_info()->flags, 0, 0); | 236 | __monitor((void *)¤t_thread_info()->flags, 0, 0); |