diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-28 10:33:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-28 10:33:06 -0500 |
| commit | 4e8f2fc1a55d543717efb70e170b09e773d0542b (patch) | |
| tree | 30df1d7fc9dfa24fe2916711a17656682c3f7ec9 /tools/perf/util/probe-finder.h | |
| parent | 158f323b9868b59967ad96957c4ca388161be321 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
| download | linux-4e8f2fc1a55d543717efb70e170b09e773d0542b.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/probe-finder.h')
| -rw-r--r-- | tools/perf/util/probe-finder.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h index f1d8558f498e..2956c5198652 100644 --- a/tools/perf/util/probe-finder.h +++ b/tools/perf/util/probe-finder.h @@ -46,6 +46,9 @@ int debuginfo__find_trace_events(struct debuginfo *dbg, int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr, struct perf_probe_point *ppt); +int debuginfo__get_text_offset(struct debuginfo *dbg, Dwarf_Addr *offs, + bool adjust_offset); + /* Find a line range */ int debuginfo__find_line_range(struct debuginfo *dbg, struct line_range *lr); |