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/map.h | |
| 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/map.h')
| -rw-r--r-- | tools/perf/util/map.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index ae2d45110588..7758c72522ef 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -35,6 +35,8 @@ struct map { bool referenced; bool erange_warned; u32 priv; + u32 prot; + u32 flags; u64 pgoff; u64 reloc; u32 maj, min; /* only valid for MMAP2 record */ @@ -118,7 +120,7 @@ void map__init(struct map *map, enum map_type type, u64 start, u64 end, u64 pgoff, struct dso *dso); struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, u64 pgoff, u32 pid, u32 d_maj, u32 d_min, u64 ino, - u64 ino_gen, + u64 ino_gen, u32 prot, u32 flags, char *filename, enum map_type type); struct map *map__new2(u64 start, struct dso *dso, enum map_type type); void map__delete(struct map *map); |