summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-04-21 16:41:10 -0700
committerAlistair Strachan <astrachan@google.com>2018-05-04 21:14:37 +0000
commit4ecc6a3658d82b419306fe95573ee1dbd957a61c (patch)
tree5bb6db5559e4e14b90d659d73fdeb90c79ffe669
parent33594740c282a935ec8638fbef7de38573b51beb (diff)
UPSTREAM: tracing: Use cpumask_available() to check if cpumask variable may be used
This fixes the following clang warning: kernel/trace/trace.c:3231:12: warning: address of array 'iter->started' will always evaluate to 'true' [-Wpointer-bool-conversion] if (iter->started) Link: http://lkml.kernel.org/r/20170421234110.117075-1-mka@chromium.org Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> (cherry picked from commit 4dbbe2d8e95c351157f292ece067f985c30c7b53) Bug: 78886293 Change-Id: Ib17a68ce55ca80b04bdea2d232f8ca9f88b1b8a3 Signed-off-by: Alistair Strachan <astrachan@google.com>
-rw-r--r--kernel/trace/trace.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c180e4dc0fb9..293faa2ff763 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2708,13 +2708,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 */