Commit 29250d30 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a2d9214c 4dbbe2d8
...@@ -3311,13 +3311,14 @@ static void test_cpu_buff_start(struct trace_iterator *iter) ...@@ -3311,13 +3311,14 @@ static void test_cpu_buff_start(struct trace_iterator *iter)
if (!(iter->iter_flags & TRACE_FILE_ANNOTATE)) if (!(iter->iter_flags & TRACE_FILE_ANNOTATE))
return; return;
if (iter->started && cpumask_test_cpu(iter->cpu, iter->started)) if (cpumask_available(iter->started) &&
cpumask_test_cpu(iter->cpu, iter->started))
return; return;
if (per_cpu_ptr(iter->trace_buffer->data, iter->cpu)->skipped_entries) if (per_cpu_ptr(iter->trace_buffer->data, iter->cpu)->skipped_entries)
return; return;
if (iter->started) if (cpumask_available(iter->started))
cpumask_set_cpu(iter->cpu, iter->started); cpumask_set_cpu(iter->cpu, iter->started);
/* Don't print started cpu buffer for the first entry of the trace */ /* Don't print started cpu buffer for the first entry of the trace */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment