diff options
| author | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-04-06 21:48:59 -0400 |
| commit | eeaab2d8af2cf1d36d7086f22e9de42d6dd2995c (patch) | |
| tree | 369b9c91a6d808944f07d2290fec6f9fe2731904 /drivers/cpuidle/cpuidle.c | |
| parent | ee01e663373343c63e0e3d364d09f6155378dbcc (diff) | |
| parent | aaef292acf3a78d9c0bb6fb72226077d286b45d7 (diff) | |
Merge branches 'idle-fix' and 'misc' into release
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index a71376a45d8e..2f0083a51a9a 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
| @@ -140,13 +140,13 @@ int cpuidle_idle_call(void) | |||
| 140 | return 0; | 140 | return 0; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | trace_power_start(POWER_CSTATE, next_state, dev->cpu); | 143 | trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu); |
| 144 | trace_cpu_idle(next_state, dev->cpu); | 144 | trace_cpu_idle_rcuidle(next_state, dev->cpu); |
| 145 | 145 | ||
| 146 | entered_state = cpuidle_enter_ops(dev, drv, next_state); | 146 | entered_state = cpuidle_enter_ops(dev, drv, next_state); |
| 147 | 147 | ||
| 148 | trace_power_end(dev->cpu); | 148 | trace_power_end_rcuidle(dev->cpu); |
| 149 | trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu); | 149 | trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); |
| 150 | 150 | ||
| 151 | if (entered_state >= 0) { | 151 | if (entered_state >= 0) { |
| 152 | /* Update cpuidle counters */ | 152 | /* Update cpuidle counters */ |