diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
commit | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (patch) | |
tree | a5d2a80f121a5c854773ddc85b1d9cbd6b840861 /kernel/trace/trace.c | |
parent | e1eaf354528ceb002c8e2840a55c44cd76aaaed8 (diff) | |
parent | 06d5631f56460917af3d9417ef63811cf0cad9ce (diff) | |
download | blackbird-op-linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.tar.gz blackbird-op-linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.zip |
Merge branch 'common/pfc' into sh-latest
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 68032c6177db..49249c28690d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -371,7 +371,7 @@ EXPORT_SYMBOL_GPL(tracing_on); void tracing_off(void) { if (global_trace.buffer) - ring_buffer_record_on(global_trace.buffer); + ring_buffer_record_off(global_trace.buffer); /* * This flag is only looked at when buffers haven't been * allocated yet. We don't really care about the race |