[tip:perfcounters/core] perf_counter tools: Warning fixes on 32-bit

tip-bot for Arjan van de Ven
2009-06-06T18:49:36Z

Commit-ID: 7d37a0cbd68c875fa984fa97bcf5c7f4b7950b6d
Gitweb: http://git.kernel.org/tip/7d37a0cbd68c875fa984fa97bcf5c7f4b7950b6d
Author: Arjan van de Ven <arjan@linux.intel.com>
AuthorDate: Sat, 6 Jun 2009 20:36:38 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sat, 6 Jun 2009 20:46:19 +0200

perf_counter tools: Warning fixes on 32-bit

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

---
tools/perf/builtin-annotate.c | 4 ++--
tools/perf/util/symbol.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 116a397..4a3c279 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -668,9 +668,9 @@ static void hist_hit(struct hist_entry *he, uint64_t ip)

if (verbose >= 3)
printf("%p %s: count++ [ip: %p, %08Lx] => %Ld\n",
- (void *)he->sym->start,
+ (void *)(unsigned long)he->sym->start,
he->sym->name,
- (void *)ip, ip - he->sym->start,
+ (void *)(unsigned long)ip, ip - he->sym->start,
sym->hist[offset]);
}

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 23f4f7b..253821d 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -21,7 +21,7 @@ static struct symbol *symbol__new(uint64_t start, uint64_t len,

if (verbose >= 2)
printf("new symbol: %016Lx [%08lx]: %s, hist: %p, obj_start: %p\n",
- (__u64)start, len, name, self->hist, (void *)obj_start);
+ (__u64)start, (unsigned long)len, name, self->hist, (void *)(unsigned long)obj_start);

self->obj_start= obj_start;
self->hist = NULL;