Fix buggy-looking code which unnecessarily adjusts the file offset
fields read from /proc/*/maps.

This may have gone unnoticed since the offset is usually 0 (and the
logic in util/symbol.c may work incorrectly for other offset values).

I make assumptions about the intended design here.  The cover note
accompanying this patch contains a more detailed explanation.

Signed-off-by: Dave Martin <dave.mar...@linaro.org>
---
 tools/perf/util/event.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 6b0db55..db8a1d4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -151,7 +151,6 @@ 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 */
@@ -162,12 +161,7 @@ static int event__synthesize_mmap_events(pid_t pid, pid_t 
tgid,
                                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;
+                       n = hex2u64(pbf, &ev.mmap.pgoff);
 
                        size = strlen(execname);
                        execname[size - 1] = '\0'; /* Remove \n */
-- 
1.7.0.4


_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev

Reply via email to