diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-08 12:23:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-08 12:23:22 +0200 |
| commit | 9ee6ddc9dada9cc4b2201631bc74fbf203183a10 (patch) | |
| tree | 5ab664dc8c98387fbaa13e549af0f1b8a5f1a1fb /kernel | |
| parent | perf/x86: Check user address explicitly in copy_from_user_nmi() (diff) | |
| parent | tracing: Have tracing_off() actually turn tracing off (diff) | |
| download | linux-9ee6ddc9dada9cc4b2201631bc74fbf203183a10.tar.xz linux-9ee6ddc9dada9cc4b2201631bc74fbf203183a10.zip | |
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); 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 |