From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/core] perf tools: Fix dwarf-aux.c compilation on i386
Date: Wed, 20 May 2015 05:22:49 -0700 [thread overview]
Message-ID: <tip-c1b9034db7c85428f96db4ecf77abbf02d96de71@git.kernel.org> (raw)
In-Reply-To: <1431706991-15646-1-git-send-email-jolsa@kernel.org>
Commit-ID: c1b9034db7c85428f96db4ecf77abbf02d96de71
Gitweb: http://git.kernel.org/tip/c1b9034db7c85428f96db4ecf77abbf02d96de71
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Fri, 15 May 2015 18:23:11 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1431706991-15646-1-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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);
}
}
prev parent reply other threads:[~2015-05-20 12:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-15 16:23 [PATCH] " Jiri Olsa
2015-05-15 19:59 ` Arnaldo Carvalho de Melo
2015-05-16 6:21 ` Jiri Olsa
2015-05-18 1:20 ` Arnaldo Carvalho de Melo
2015-05-18 14:31 ` Jiri Olsa
2015-05-20 12:22 ` tip-bot for Jiri Olsa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-c1b9034db7c85428f96db4ecf77abbf02d96de71@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hekuang@huawei.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome