diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-28 01:44:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-28 01:44:25 -0400 |
| commit | d652f4bbca35100358bad83c29ec0e40a1f8e5cc (patch) | |
| tree | a59e6ad6dca5e98f82ce87da2c2b69922c6a4da5 /tools | |
| parent | e3a6a62400520452fe39740dca90a1d0b94b8f92 (diff) | |
| parent | a01851faab4b485e94c2ceaa1d0208a8d16ce367 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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) | |||
| 202 | 202 | ||
| 203 | /* Last entry */ | 203 | /* Last entry */ |
| 204 | if (curr->end == curr->start) | 204 | if (curr->end == curr->start) |
| 205 | curr->end = roundup(curr->start, 4096); | 205 | curr->end = roundup(curr->start, 4096) + 4096; |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | void __map_groups__fixup_end(struct map_groups *mg, enum map_type type) | 208 | void __map_groups__fixup_end(struct map_groups *mg, enum map_type type) |