Skip to content

Commit

Permalink
Merge tag 'perf-urgent-for-mingo-4.11-20170317' of git://git.kernel.o…
Browse files Browse the repository at this point in the history
…rg/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>
  • Loading branch information
Ingo Molnar committed Mar 17, 2017
2 parents 4b07372 + e7ede72 commit a01851f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit a01851f

Please sign in to comment.