diff options
author | Ingo Molnar | 2014-06-12 13:53:16 +0200 |
---|---|---|
committer | Ingo Molnar | 2014-06-12 13:53:16 +0200 |
commit | 94eb153130ce2c5f5f4959c96ea8197475bd66b6 (patch) | |
tree | 452c7fd4bd5d494d8b170fd5e840a5ae004e65ba /tools/perf/util/machine.c | |
parent | perf: Differentiate exec() and non-exec() comm events (diff) | |
parent | perf tools: Add dcacheline sort (diff) | |
download | kernel-qcow2-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.tar.gz kernel-qcow2-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.tar.xz kernel-qcow2-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.zip |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Bitmask handling and plugin updates (Steven Rostedt)
* Fix pipe check regression in attr event callback (Jiri Olsa)
* Prettify the tags/TAGS/cscope targets output (Jiri Olsa)
* Print array argument as string (Namhyung Kim)
* Pass protection and flags bits through mmap2 interface (Peter Zijlstra)
* Update perf tool mmap2 interface with protection and flag bits (Don Zickus)
* Re-enable mmap interface (Don Zickus)
* Add mem-mode documentation to report command (Don Zickus)
* Add sort on dcacheline (Don Zickus)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
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); |