diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:47:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:47:07 +0100 |
| commit | 2737fce8bc8dea2852289df29b4f92e6a7fb7c91 (patch) | |
| tree | fd8198cd128aa99e87c73515a3330d57a097734c /tools/perf/util/map.h | |
| parent | perf/doc: Remove mention of non-existent set_perf_event_pending() from design... (diff) | |
| parent | perf buildid-cache: Check relocation when checking for existing kcore (diff) | |
| download | linux-2737fce8bc8dea2852289df29b4f92e6a7fb7c91.tar.xz linux-2737fce8bc8dea2852289df29b4f92e6a7fb7c91.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
* Fix annotation for relocated kernel (Adrian Hunter)
* Fix demangling of symbols in kernel and kernel modules (Avi Kivity)
* Fix include for non x86 architectures (Francesco Fusco)
* Fix ARM64 memory barriers (Peter Zijlstra)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/map.h')
| -rw-r--r-- | tools/perf/util/map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 18068c6b71c1..257e513205ce 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -36,6 +36,7 @@ struct map { bool erange_warned; u32 priv; u64 pgoff; + u64 reloc; u32 maj, min; /* only valid for MMAP2 record */ u64 ino; /* only valid for MMAP2 record */ u64 ino_generation;/* only valid for MMAP2 record */ |