diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-03 08:06:59 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-03 08:06:59 +0300 |
| commit | a8e28440016bfb23bec266c4c66eacca6ea2d48b (patch) | |
| tree | 27d528294f7886c434c8072a034d211acc06d077 /tools/perf | |
| parent | 2b5efc089769cd2aa583880d29416d00e7441f39 (diff) | |
| parent | 3209f68b3ca4667069923a325c88b21131bfdf9f (diff) | |
| download | linux-a8e28440016bfb23bec266c4c66eacca6ea2d48b.tar.xz | |
Merge branch 'work.statx' into for-next
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/symbol.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c index 7913363bde5c..4f3c758d875d 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c @@ -31,7 +31,7 @@ #error Instruction buffer size too small #endif -/* Based on branch_type() from perf_event_intel_lbr.c */ +/* Based on branch_type() from arch/x86/events/intel/lbr.c */ static void intel_pt_insn_decoder(struct insn *insn, struct intel_pt_insn *intel_pt_insn) { 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) |