[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-eo2t4uhlbne105z72tvyzkp1@git.kernel.org>
Date: Tue, 21 Feb 2017 00:11:23 -0800
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...nel.org, dsahern@...il.com, jolsa@...nel.org,
hpa@...or.com, wangnan0@...wei.com, namhyung@...nel.org,
acme@...hat.com, ak@...ux.intel.com, tglx@...utronix.de,
linux-kernel@...r.kernel.org, adrian.hunter@...el.com
Subject: [tip:perf/urgent] perf session: Fix DEBUG=1 build with clang
Commit-ID: 8074bf51fe5af68dcbc12bd7fa72dc4be8f41dde
Gitweb: http://git.kernel.org/tip/8074bf51fe5af68dcbc12bd7fa72dc4be8f41dde
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Fri, 17 Feb 2017 12:27:26 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Fri, 17 Feb 2017 12:27:26 -0300
perf session: Fix DEBUG=1 build with clang
The struct branch_stack->branch_stack.cycles field is a u64 :16
bitfield, and this somehow confuses clang 4.0 when checking the
arguments of a printf format, so cast the :16 to unsigned short to help
it.
Silences this:
util/session.c:935:4: error: format specifies type 'unsigned short' but the argument has type 'u64' (aka 'unsigned long') [-Werror,-Wformat]
e->flags.cycles,
^~~~~~~~~~~~~~~
1 error generated.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/n/tip-eo2t4uhlbne105z72tvyzkp1@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/session.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 4cdbc8f..1dd617d 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -932,7 +932,7 @@ static void branch_stack__printf(struct perf_sample *sample)
printf("..... %2"PRIu64": %016" PRIx64 " -> %016" PRIx64 " %hu cycles %s%s%s%s %x\n",
i, e->from, e->to,
- e->flags.cycles,
+ (unsigned short)e->flags.cycles,
e->flags.mispred ? "M" : " ",
e->flags.predicted ? "P" : " ",
e->flags.abort ? "A" : " ",
Powered by blists - more mailing lists