diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-17 15:13:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-17 15:13:28 +0100 |
commit | a01851faab4b485e94c2ceaa1d0208a8d16ce367 (patch) | |
tree | a4ee46c67bcedfb7303a1f457cd4ce9b59b00dbb /tools/perf | |
parent | 4b07372a32c0c1505a7634ad7e607d83340ef645 (diff) | |
parent | e7ede72a6d40cb3a30c087142d79381ca8a31dab (diff) | |
download | linux-stable-a01851faab4b485e94c2ceaa1d0208a8d16ce367.tar.gz linux-stable-a01851faab4b485e94c2ceaa1d0208a8d16ce367.tar.bz2 linux-stable-a01851faab4b485e94c2ceaa1d0208a8d16ce367.zip |
Merge tag 'perf-urgent-for-mingo-4.11-20170317' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo:
- Fix symbols__fixup_end heuristic for corner cases, such as JITted eBPF
programs, that are loaded at page aligned addresses, just after the
kernel proper (Daniel Borkmann)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/util/symbol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 70e389bc4af7..9b4d8ba22fed 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -202,7 +202,7 @@ void symbols__fixup_end(struct rb_root *symbols) /* Last entry */ if (curr->end == curr->start) - curr->end = roundup(curr->start, 4096); + curr->end = roundup(curr->start, 4096) + 4096; } void __map_groups__fixup_end(struct map_groups *mg, enum map_type type) |