Skip to content

Commit

Permalink
Merge tag 'trace-v4.12-3' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/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
  • Loading branch information
torvalds committed May 10, 2017
2 parents a2d9214 + 4dbbe2d commit 29250d3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3311,13 +3311,14 @@ static void test_cpu_buff_start(struct trace_iterator *iter)
if (!(iter->iter_flags & TRACE_FILE_ANNOTATE))
return;

if (iter->started && cpumask_test_cpu(iter->cpu, iter->started))
if (cpumask_available(iter->started) &&
cpumask_test_cpu(iter->cpu, iter->started))
return;

if (per_cpu_ptr(iter->trace_buffer->data, iter->cpu)->skipped_entries)
return;

if (iter->started)
if (cpumask_available(iter->started))
cpumask_set_cpu(iter->cpu, iter->started);

/* Don't print started cpu buffer for the first entry of the trace */
Expand Down

0 comments on commit 29250d3

Please sign in to comment.