aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2012-03-20 14:15:39 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-03-22 14:11:18 -0400
commit9fafd98f1bf14276f95b69f0186ad5675f1e1a18 (patch)
tree16709d704a5b1b8adb0a30ebf03425e8d95af17d /tools
parent842f07f6127afa48cca6b2ce9021b985e8eb9068 (diff)
perf tools: Fix various casting issues for 32 bits
- util/parse-events.c(parse_events_add_breakpoint) need to use unsigned long instead of u64, otherwise we get following gcc error on 32 bits: error: cast from pointer to integer of different size - util/header.c(print_event_desc) cannot retype to signed type, otherwise we get following gcc error on 32 bits: error: comparison between signed and unsigned integer expressions Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1332267341-26338-2-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/header.c2
-rw-r--r--tools/perf/util/parse-events.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index fcd9cf3ea63e..4c7c2d73251f 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1177,7 +1177,7 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
1177 goto error; 1177 goto error;
1178 1178
1179 msz = sizeof(attr); 1179 msz = sizeof(attr);
1180 if (sz < (ssize_t)msz) 1180 if (sz < msz)
1181 msz = sz; 1181 msz = sz;
1182 1182
1183 for (i = 0 ; i < nre; i++) { 1183 for (i = 0 ; i < nre; i++) {
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 201b40f0ca0b..f542a631388b 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -569,7 +569,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
569 char name[MAX_NAME_LEN]; 569 char name[MAX_NAME_LEN];
570 570
571 memset(&attr, 0, sizeof(attr)); 571 memset(&attr, 0, sizeof(attr));
572 attr.bp_addr = (u64) ptr; 572 attr.bp_addr = (unsigned long) ptr;
573 573
574 if (parse_breakpoint_type(type, &attr)) 574 if (parse_breakpoint_type(type, &attr))
575 return -EINVAL; 575 return -EINVAL;