From f174c88b46e52d590f5b28e718cd1983d3745f3c Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Tue, 20 Mar 2012 19:15:39 +0100
Subject: [PATCH] --- yaml --- r: 298331 b: refs/heads/master c:
 9fafd98f1bf14276f95b69f0186ad5675f1e1a18 h: refs/heads/master i:   298329:
 c2f61d2f9e97f43bf24a9bd837912e42233ff2e6   298327:
 c784dfc9128f497260fba667d2495295e42fe659 v: v3

---
 [refs]                               | 2 +-
 trunk/tools/perf/util/header.c       | 2 +-
 trunk/tools/perf/util/parse-events.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 580663cfcbc2..fac8e14e7f04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 842f07f6127afa48cca6b2ce9021b985e8eb9068
+refs/heads/master: 9fafd98f1bf14276f95b69f0186ad5675f1e1a18
diff --git a/trunk/tools/perf/util/header.c b/trunk/tools/perf/util/header.c
index fcd9cf3ea63e..4c7c2d73251f 100644
--- a/trunk/tools/perf/util/header.c
+++ b/trunk/tools/perf/util/header.c
@@ -1177,7 +1177,7 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
 		goto error;
 
 	msz = sizeof(attr);
-	if (sz < (ssize_t)msz)
+	if (sz < msz)
 		msz = sz;
 
 	for (i = 0 ; i < nre; i++) {
diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c
index 201b40f0ca0b..f542a631388b 100644
--- a/trunk/tools/perf/util/parse-events.c
+++ b/trunk/tools/perf/util/parse-events.c
@@ -569,7 +569,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
 	char name[MAX_NAME_LEN];
 
 	memset(&attr, 0, sizeof(attr));
-	attr.bp_addr = (u64) ptr;
+	attr.bp_addr = (unsigned long) ptr;
 
 	if (parse_breakpoint_type(type, &attr))
 		return -EINVAL;