Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

3 files changed, 22 insertions, 27 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 1e8e92e317b9..b513e40974f4 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1082,26 +1082,6 @@ static void event__process_sample(const event_t *self,
         }
 }
 
-static int event__process(event_t *event, struct perf_session *session)
-{
-        switch (event->header.type) {
-        case PERF_RECORD_COMM:
-                event__process_comm(event, session);
-                break;
-        case PERF_RECORD_MMAP:
-                event__process_mmap(event, session);
-                break;
-        case PERF_RECORD_FORK:
-        case PERF_RECORD_EXIT:
-                event__process_task(event, session);
-                break;
-        default:
-                break;
-        }
-
-        return 0;
-}
-
 struct mmap_data {
         int                     counter;
         void                    *base;
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 6b0db5577929..dab9e754a281 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 */
@@ -554,6 +548,26 @@ int event__process_task(event_t *self, struct perf_session *session)
         return 0;
 }
 
+int event__process(event_t *event, struct perf_session *session)
+{
+        switch (event->header.type) {
+        case PERF_RECORD_COMM:
+                event__process_comm(event, session);
+                break;
+        case PERF_RECORD_MMAP:
+                event__process_mmap(event, session);
+                break;
+        case PERF_RECORD_FORK:
+        case PERF_RECORD_EXIT:
+                event__process_task(event, session);
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
 void thread__find_addr_map(struct thread *self,
                            struct perf_session *session, u8 cpumode,
                            enum map_type type, pid_t pid, u64 addr,
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 887ee63bbb62..8e790dae7026 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -154,6 +154,7 @@ int event__process_comm(event_t *self, struct perf_session *session);
 int event__process_lost(event_t *self, struct perf_session *session);
 int event__process_mmap(event_t *self, struct perf_session *session);
 int event__process_task(event_t *self, struct perf_session *session);
+int event__process(event_t *event, struct perf_session *session);
 
 struct addr_location;
 int event__preprocess_sample(const event_t *self, struct perf_session *session,