* [PATCH] perf tools: Fix dwarf-aux.c compilation on i386
@ 2015-05-15 16:23 Jiri Olsa
2015-05-15 19:59 ` Arnaldo Carvalho de Melo
2015-05-20 12:22 ` [tip:perf/core] " tip-bot for Jiri Olsa
0 siblings, 2 replies; 6+ messages in thread
From: Jiri Olsa @ 2015-05-15 16:23 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: He Kuang, lkml, Peter Zijlstra, Paul Mackerras, David Ahern,
Namhyung Kim, Ingo Molnar
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386
2015-05-15 16:23 [PATCH] perf tools: Fix dwarf-aux.c compilation on i386 Jiri Olsa
@ 2015-05-15 19:59 ` Arnaldo Carvalho de Melo
2015-05-16 6:21 ` Jiri Olsa
2015-05-20 12:22 ` [tip:perf/core] " tip-bot for Jiri Olsa
1 sibling, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-05-15 19:59 UTC (permalink / raw)
To: Jiri Olsa
Cc: He Kuang, lkml, Peter Zijlstra, Paul Mackerras, David Ahern,
Namhyung Kim, Ingo Molnar
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386
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
0 siblings, 1 reply; 6+ messages in thread
From: Jiri Olsa @ 2015-05-16 6:21 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, He Kuang, lkml, Peter Zijlstra, Paul Mackerras,
David Ahern, Namhyung Kim, Ingo Molnar
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386
2015-05-16 6:21 ` Jiri Olsa
@ 2015-05-18 1:20 ` Arnaldo Carvalho de Melo
2015-05-18 14:31 ` Jiri Olsa
0 siblings, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-05-18 1:20 UTC (permalink / raw)
To: Jiri Olsa
Cc: Jiri Olsa, He Kuang, lkml, Peter Zijlstra, Paul Mackerras,
David Ahern, Namhyung Kim, Ingo Molnar
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf tools: Fix dwarf-aux.c compilation on i386
2015-05-18 1:20 ` Arnaldo Carvalho de Melo
@ 2015-05-18 14:31 ` Jiri Olsa
0 siblings, 0 replies; 6+ messages in thread
From: Jiri Olsa @ 2015-05-18 14:31 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, He Kuang, lkml, Peter Zijlstra, Paul Mackerras,
David Ahern, Namhyung Kim, Ingo Molnar
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:perf/core] perf tools: Fix dwarf-aux.c compilation on i386
2015-05-15 16:23 [PATCH] perf tools: Fix dwarf-aux.c compilation on i386 Jiri Olsa
2015-05-15 19:59 ` Arnaldo Carvalho de Melo
@ 2015-05-20 12:22 ` tip-bot for Jiri Olsa
1 sibling, 0 replies; 6+ messages in thread
From: tip-bot for Jiri Olsa @ 2015-05-20 12:22 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, hpa, namhyung, a.p.zijlstra, mingo, paulus, linux-kernel,
dsahern, acme, hekuang, jolsa
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);
}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-05-20 12:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-15 16:23 [PATCH] perf tools: Fix dwarf-aux.c compilation on i386 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:perf/core] " tip-bot for Jiri Olsa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).