diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
| commit | cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (patch) | |
| tree | 9eed06e09fbbe3764f47e4da7f8d15b5965f6cb3 /tools/perf/util/machine.c | |
| parent | 4cdf77a828b056258f48a9f6078bd2f77d9704bb (diff) | |
| parent | 4ba96195051be30160af6d5f5f83f9a055ab1f23 (diff) | |
| download | talos-op-linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.tar.gz talos-op-linux-cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6.zip | |
Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/machine.c')
| -rw-r--r-- | tools/perf/util/machine.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 7409ac8de51c..0e5fea95d596 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1060,6 +1060,8 @@ int machine__process_mmap2_event(struct machine *machine, event->mmap2.pid, event->mmap2.maj, event->mmap2.min, event->mmap2.ino, event->mmap2.ino_generation, + event->mmap2.prot, + event->mmap2.flags, event->mmap2.filename, type); if (map == NULL) @@ -1105,7 +1107,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event map = map__new(&machine->user_dsos, event->mmap.start, event->mmap.len, event->mmap.pgoff, - event->mmap.pid, 0, 0, 0, 0, + event->mmap.pid, 0, 0, 0, 0, 0, 0, event->mmap.filename, type); |
