diff options
| author | Sasha Levin <sasha.levin@oracle.com> | 2015-09-04 18:45:56 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-11-03 22:10:08 +0100 |
| commit | 919cd9799936843d0af4f0904a3e39e70294c4d8 (patch) | |
| tree | 0ee313042508d083077aa384c4983716f717a240 /kernel/trace | |
| parent | ring_buffer: Fix more races when terminating the producer in the benchmark (diff) | |
| download | linux-919cd9799936843d0af4f0904a3e39e70294c4d8.tar.xz linux-919cd9799936843d0af4f0904a3e39e70294c4d8.zip | |
tracing: Allow dumping traces without tracking trace started cpus
We don't init iter->started when dumping the ftrace buffer, and there's no
real need to do so - so allow skipping that check if the iter doesn't have
an initialized ->started cpumask.
Link: http://lkml.kernel.org/r/1441385156-27279-1-git-send-email-sasha.levin@oracle.com
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 67873c67665e..6459e141aac3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2671,13 +2671,14 @@ static void test_cpu_buff_start(struct trace_iterator *iter) if (!(iter->iter_flags & TRACE_FILE_ANNOTATE)) return; - if (cpumask_test_cpu(iter->cpu, iter->started)) + if (iter->started && cpumask_test_cpu(iter->cpu, iter->started)) return; if (per_cpu_ptr(iter->trace_buffer->data, iter->cpu)->skipped_entries) return; - cpumask_set_cpu(iter->cpu, iter->started); + if (iter->started) + cpumask_set_cpu(iter->cpu, iter->started); /* Don't print started cpu buffer for the first entry of the trace */ if (iter->idx > 1) |