From 6e9bcd2c023c8556cb62b2660dc3eb78bd101308 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sat, 3 Apr 2010 22:53:31 +1100
Subject: [PATCH] --- yaml --- r: 191173 b: refs/heads/master c:
 4af8b35db6634dd1e0d616de689582b6c93550af h: refs/heads/master i:   191171:
 c5acf676e26f1b3d420cbad070eb44b25458abff v: v3

---
 [refs]                        | 2 +-
 trunk/tools/perf/util/event.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 17d85cbe1843..a09d1bca578e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e206d556c5793ac5e28c0aaba2e07432e5f9a098
+refs/heads/master: 4af8b35db6634dd1e0d616de689582b6c93550af
diff --git a/trunk/tools/perf/util/event.c b/trunk/tools/perf/util/event.c
index 052eaeccc202..571fb25f7eb9 100644
--- a/trunk/tools/perf/util/event.c
+++ b/trunk/tools/perf/util/event.c
@@ -130,6 +130,7 @@ static int event__synthesize_mmap_events(pid_t pid, pid_t tgid,
 			continue;
 		pbf += n + 3;
 		if (*pbf == 'x') { /* vm_exec */
+			u64 vm_pgoff;
 			char *execname = strchr(bf, '/');
 
 			/* Catch VDSO */
@@ -139,6 +140,14 @@ static int event__synthesize_mmap_events(pid_t pid, pid_t tgid,
 			if (execname == NULL)
 				continue;
 
+			pbf += 3;
+			n = hex2u64(pbf, &vm_pgoff);
+			/* pgoff is in bytes, not pages */
+			if (n >= 0)
+				ev.mmap.pgoff = vm_pgoff << getpagesize();
+			else
+				ev.mmap.pgoff = 0;
+
 			size = strlen(execname);
 			execname[size - 1] = '\0'; /* Remove \n */
 			memcpy(ev.mmap.filename, execname, size);