diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-02-07 09:46:01 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-02-13 09:14:46 -0500 |
commit | 76027ea863fc02698da536b4970784eed3caa635 (patch) | |
tree | aef940211f8e9e78b13df1be92517ad51a76089e /drivers/cpuidle | |
parent | 484546509ce5d49d43ec0a6eb2141c6bf3362bfc (diff) |
cpuidle/tracing: Denote the tracepoints as being in rcu_idle_exit() section
As the tracepoints in the cpuidle code are called when rcu_idle_exit() is in
effect, the _rcuidle() version must be used, otherwise the rcu_read_lock()s
that protect the tracepoint will not be honored.
Cc: Len Brown <len.brown@intel.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'drivers/cpuidle')
-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 59f4261c753a..6588f43017bd 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
@@ -94,13 +94,13 @@ int cpuidle_idle_call(void) | |||
94 | 94 | ||
95 | target_state = &drv->states[next_state]; | 95 | target_state = &drv->states[next_state]; |
96 | 96 | ||
97 | trace_power_start(POWER_CSTATE, next_state, dev->cpu); | 97 | trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu); |
98 | trace_cpu_idle(next_state, dev->cpu); | 98 | trace_cpu_idle_rcuidle(next_state, dev->cpu); |
99 | 99 | ||
100 | entered_state = target_state->enter(dev, drv, next_state); | 100 | entered_state = target_state->enter(dev, drv, next_state); |
101 | 101 | ||
102 | trace_power_end(dev->cpu); | 102 | trace_power_end_rcuidle(dev->cpu); |
103 | trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu); | 103 | trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); |
104 | 104 | ||
105 | if (entered_state >= 0) { | 105 | if (entered_state >= 0) { |
106 | /* Update cpuidle counters */ | 106 | /* Update cpuidle counters */ |