From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753510AbbETMXV (ORCPT ); Wed, 20 May 2015 08:23:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56677 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752628AbbETMXR (ORCPT ); Wed, 20 May 2015 08:23:17 -0400 Date: Wed, 20 May 2015 05:22:49 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, paulus@samba.org, linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, hekuang@huawei.com, jolsa@kernel.org Reply-To: tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, paulus@samba.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, hekuang@huawei.com, jolsa@kernel.org In-Reply-To: <1431706991-15646-1-git-send-email-jolsa@kernel.org> References: <1431706991-15646-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix dwarf-aux.c compilation on i386 Git-Commit-ID: c1b9034db7c85428f96db4ecf77abbf02d96de71 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: c1b9034db7c85428f96db4ecf77abbf02d96de71 Gitweb: http://git.kernel.org/tip/c1b9034db7c85428f96db4ecf77abbf02d96de71 Author: Jiri Olsa AuthorDate: Fri, 15 May 2015 18:23:11 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 15 May 2015 16:59:43 -0300 perf tools: Fix dwarf-aux.c compilation on i386 Replacing %lu format strings for Dwarf_Addr type with PRIu64 as it fits for Dwarf_Addr (defined as uint64_t) type and works also on both 32/64 bits. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: He Kuang Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1431706991-15646-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dwarf-aux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index eb47abd..57f3ef4 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c @@ -994,11 +994,11 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die, end -= entry; if (first) { - strbuf_addf(buf, "@<%s+[%lu-%lu", + strbuf_addf(buf, "@<%s+[%" PRIu64 "-%" PRIu64, name, start, end); first = false; } else { - strbuf_addf(buf, ",%lu-%lu", + strbuf_addf(buf, ",%" PRIu64 "-%" PRIu64, start, end); } } @@ -1057,11 +1057,11 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf) start -= entry; end -= entry; if (first) { - strbuf_addf(buf, "@<%s+[%lu-%lu", + strbuf_addf(buf, "@<%s+[%" PRIu64 "-%" PRIu64, name, start, end); first = false; } else { - strbuf_addf(buf, ",%lu-%lu", + strbuf_addf(buf, ",%" PRIu64 "-%" PRIu64, start, end); } }