From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751428AbdBUILo (ORCPT ); Tue, 21 Feb 2017 03:11:44 -0500 Received: from terminus.zytor.com ([65.50.211.136]:55810 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750954AbdBUILf (ORCPT ); Tue, 21 Feb 2017 03:11:35 -0500 Date: Tue, 21 Feb 2017 00:11:23 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, hpa@zytor.com, wangnan0@huawei.com, namhyung@kernel.org, acme@redhat.com, ak@linux.intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, adrian.hunter@intel.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, acme@redhat.com, ak@linux.intel.com, wangnan0@huawei.com, mingo@kernel.org, dsahern@gmail.com, jolsa@kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf session: Fix DEBUG=1 build with clang Git-Commit-ID: 8074bf51fe5af68dcbc12bd7fa72dc4be8f41dde X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8074bf51fe5af68dcbc12bd7fa72dc4be8f41dde Gitweb: http://git.kernel.org/tip/8074bf51fe5af68dcbc12bd7fa72dc4be8f41dde Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 17 Feb 2017 12:27:26 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-eo2t4uhlbne105z72tvyzkp1@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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" : " ",