diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-17 13:59:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-17 13:59:52 -0700 |
| commit | a7fc726bb2e3ab3e960064392aa7cb66999d6927 (patch) | |
| tree | 070f0b32f2dc5d8a06d48f1a15c161d4c97c0295 /tools | |
| parent | cd21debe5318842a0bbd38c0327cfde2a3b90d65 (diff) | |
| parent | a01851faab4b485e94c2ceaa1d0208a8d16ce367 (diff) | |
| download | linux-a7fc726bb2e3ab3e960064392aa7cb66999d6927.tar.gz linux-a7fc726bb2e3ab3e960064392aa7cb66999d6927.tar.bz2 linux-a7fc726bb2e3ab3e960064392aa7cb66999d6927.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"A set of perf related fixes:
- fix a CR4.PCE propagation issue caused by usage of mm instead of
active_mm and therefore propagated the wrong value.
- perf core fixes, which plug a use-after-free issue and make the
event inheritance on fork more robust.
- a tooling fix for symbol handling"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf symbols: Fix symbols__fixup_end heuristic for corner cases
x86/perf: Clarify why x86_pmu_event_mapped() isn't racy
x86/perf: Fix CR4.PCE propagation to use active_mm instead of mm
perf/core: Better explain the inherit magic
perf/core: Simplify perf_event_free_task()
perf/core: Fix event inheritance on fork()
perf/core: Fix use-after-free in perf_release()
Diffstat (limited to 'tools')
| -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) |