diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 14:26:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 14:26:25 -0400 |
commit | 29250d301b0c75ef142b51eebee6b7403cc79624 (patch) | |
tree | f304faa1aa9e808eaca6e2de67018708674e31c8 | |
parent | a2d9214c730f54ff72c2940bcd7f22d1fccb26ec (diff) | |
parent | 4dbbe2d8e95c351157f292ece067f985c30c7b53 (diff) |
Merge tag 'trace-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"This is a trivial patch that changes a check for a cpumask from a NULL
pointer to using cpumask_available(), which will do the check. This is
because cpumasks when not allocated are always set, and clang
complains about it"
* tag 'trace-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Use cpumask_available() to check if cpumask variable may be used
-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 4ad4420b33d6..c4536c449021 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -3311,13 +3311,14 @@ static void test_cpu_buff_start(struct trace_iterator *iter) | |||
3311 | if (!(iter->iter_flags & TRACE_FILE_ANNOTATE)) | 3311 | if (!(iter->iter_flags & TRACE_FILE_ANNOTATE)) |
3312 | return; | 3312 | return; |
3313 | 3313 | ||
3314 | if (iter->started && cpumask_test_cpu(iter->cpu, iter->started)) | 3314 | if (cpumask_available(iter->started) && |
3315 | cpumask_test_cpu(iter->cpu, iter->started)) | ||
3315 | return; | 3316 | return; |
3316 | 3317 | ||
3317 | if (per_cpu_ptr(iter->trace_buffer->data, iter->cpu)->skipped_entries) | 3318 | if (per_cpu_ptr(iter->trace_buffer->data, iter->cpu)->skipped_entries) |
3318 | return; | 3319 | return; |
3319 | 3320 | ||
3320 | if (iter->started) | 3321 | if (cpumask_available(iter->started)) |
3321 | cpumask_set_cpu(iter->cpu, iter->started); | 3322 | cpumask_set_cpu(iter->cpu, iter->started); |
3322 | 3323 | ||
3323 | /* Don't print started cpu buffer for the first entry of the trace */ | 3324 | /* Don't print started cpu buffer for the first entry of the trace */ |