[PATCH] perf tools: Fix dwarf-aux.c compilation on i386

[PATCH] perf tools: Fix dwarf-aux.c compilation on i386

[Jiri Olsa]

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.

Link: http://lkml.kernel.org/n/tip-q75siqyhcqv2iqvix0d6sp0h@git.kernel.org
Cc: He Kuang <hekuang@huawei.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 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 eb47abdcf0ac..57f3ef41c2bc 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);
 		}
 	}
-- 
1.9.3

Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386

[Arnaldo Carvalho de Melo]

Em Fri, May 15, 2015 at 06:23:11PM +0200, Jiri Olsa escreveu:
> 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.

Jiri,

	Please try to always indicate against which branch your patches
should be applied, be it as [PATCH perf/core], [PATCH perf/urgent] for
isolated patches, or on the cover letter [GIT PULL 0/N perf/core], or as
I do with Ingo, "[GIT PULL] perf/core fixes".

	I thought, for this one, hey, its a fix, should go soon to Ingo!
Tried to apply to perf/urgent, and it didn't apply :-\

	Applying to perf/core instead now.

Thanks,

- Arnaldo

Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386

[Jiri Olsa]

On Fri, May 15, 2015 at 04:59:31PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Fri, May 15, 2015 at 06:23:11PM +0200, Jiri Olsa escreveu:
> > 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.
> 
> Jiri,
> 
> 	Please try to always indicate against which branch your patches
> should be applied, be it as [PATCH perf/core], [PATCH perf/urgent] for
> isolated patches, or on the cover letter [GIT PULL 0/N perf/core], or as
> I do with Ingo, "[GIT PULL] perf/core fixes".
> 
> 	I thought, for this one, hey, its a fix, should go soon to Ingo!
> Tried to apply to perf/urgent, and it didn't apply :-\
> 
> 	Applying to perf/core instead now.

hum, I've never rebased against perf/urgent, I'll try
to squeeze it in next time ;-)

jirka

Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386

[Arnaldo Carvalho de Melo]

Em Sat, May 16, 2015 at 08:21:49AM +0200, Jiri Olsa escreveu:
> On Fri, May 15, 2015 at 04:59:31PM -0300, Arnaldo Carvalho de Melo wrote:
> > Em Fri, May 15, 2015 at 06:23:11PM +0200, Jiri Olsa escreveu:
> > > 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.

> > 	Please try to always indicate against which branch your patches
> > should be applied, be it as [PATCH perf/core], [PATCH perf/urgent] for
> > isolated patches, or on the cover letter [GIT PULL 0/N perf/core], or as
> > I do with Ingo, "[GIT PULL] perf/core fixes".

> > 	I thought, for this one, hey, its a fix, should go soon to Ingo!
> > Tried to apply to perf/urgent, and it didn't apply :-\

> > 	Applying to perf/core instead now.
 
> hum, I've never rebased against perf/urgent, I'll try
> to squeeze it in next time ;-)

In general, if it is a fix, try to check if it should be applied to
perf/urgent first, if that is not the case, then it is fixing a bug
introduced in perf/core, where it should go.

If you don't make it clear where to apply, then the burden is on me to
check, if I have to do it for everybody... it doesn't scale :-)

- Arnaldo

Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386

[Jiri Olsa]

On Sun, May 17, 2015 at 10:20:29PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Sat, May 16, 2015 at 08:21:49AM +0200, Jiri Olsa escreveu:
> > On Fri, May 15, 2015 at 04:59:31PM -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Fri, May 15, 2015 at 06:23:11PM +0200, Jiri Olsa escreveu:
> > > > 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.
> 
> > > 	Please try to always indicate against which branch your patches
> > > should be applied, be it as [PATCH perf/core], [PATCH perf/urgent] for
> > > isolated patches, or on the cover letter [GIT PULL 0/N perf/core], or as
> > > I do with Ingo, "[GIT PULL] perf/core fixes".
> 
> > > 	I thought, for this one, hey, its a fix, should go soon to Ingo!
> > > Tried to apply to perf/urgent, and it didn't apply :-\
> 
> > > 	Applying to perf/core instead now.
>  
> > hum, I've never rebased against perf/urgent, I'll try
> > to squeeze it in next time ;-)
> 
> In general, if it is a fix, try to check if it should be applied to
> perf/urgent first, if that is not the case, then it is fixing a bug
> introduced in perf/core, where it should go.
> 
> If you don't make it clear where to apply, then the burden is on me to
> check, if I have to do it for everybody... it doesn't scale :-)

ok, will try to do it next time

thanks,
jirka

[tip:perf/core] perf tools: Fix dwarf-aux.c compilation on i386

[tip-bot for Jiri Olsa]

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);
 		}
 	}