diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-08 06:23:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-08 06:23:22 -0400 |
| commit | 9ee6ddc9dada9cc4b2201631bc74fbf203183a10 (patch) | |
| tree | 5ab664dc8c98387fbaa13e549af0f1b8a5f1a1fb /kernel | |
| parent | db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72 (diff) | |
| parent | f2bf1f6f5f89d031245067512449fc889b2f4bb2 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Pull brown paper bag fix from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -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); | |||
| 371 | void tracing_off(void) | 371 | void tracing_off(void) |
| 372 | { | 372 | { |
| 373 | if (global_trace.buffer) | 373 | if (global_trace.buffer) |
| 374 | ring_buffer_record_on(global_trace.buffer); | 374 | ring_buffer_record_off(global_trace.buffer); |
| 375 | /* | 375 | /* |
| 376 | * This flag is only looked at when buffers haven't been | 376 | * This flag is only looked at when buffers haven't been |
| 377 | * allocated yet. We don't really care about the race | 377 | * allocated yet. We don't really care about the race |