diff options
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r-- | tools/perf/builtin-annotate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index e0aa14faf2b5..9bb637165bf9 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
@@ -156,7 +156,7 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter, | |||
156 | struct hist_entry *he = iter->he; | 156 | struct hist_entry *he = iter->he; |
157 | struct branch_info *bi; | 157 | struct branch_info *bi; |
158 | struct perf_sample *sample = iter->sample; | 158 | struct perf_sample *sample = iter->sample; |
159 | struct perf_evsel *evsel = iter->evsel; | 159 | struct evsel *evsel = iter->evsel; |
160 | int err; | 160 | int err; |
161 | 161 | ||
162 | bi = he->branch_info; | 162 | bi = he->branch_info; |
@@ -171,7 +171,7 @@ out: | |||
171 | return err; | 171 | return err; |
172 | } | 172 | } |
173 | 173 | ||
174 | static int process_branch_callback(struct perf_evsel *evsel, | 174 | static int process_branch_callback(struct evsel *evsel, |
175 | struct perf_sample *sample, | 175 | struct perf_sample *sample, |
176 | struct addr_location *al __maybe_unused, | 176 | struct addr_location *al __maybe_unused, |
177 | struct perf_annotate *ann, | 177 | struct perf_annotate *ann, |
@@ -208,7 +208,7 @@ static bool has_annotation(struct perf_annotate *ann) | |||
208 | return ui__has_annotation() || ann->use_stdio2; | 208 | return ui__has_annotation() || ann->use_stdio2; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int perf_evsel__add_sample(struct perf_evsel *evsel, | 211 | static int perf_evsel__add_sample(struct evsel *evsel, |
212 | struct perf_sample *sample, | 212 | struct perf_sample *sample, |
213 | struct addr_location *al, | 213 | struct addr_location *al, |
214 | struct perf_annotate *ann, | 214 | struct perf_annotate *ann, |
@@ -257,7 +257,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, | |||
257 | static int process_sample_event(struct perf_tool *tool, | 257 | static int process_sample_event(struct perf_tool *tool, |
258 | union perf_event *event, | 258 | union perf_event *event, |
259 | struct perf_sample *sample, | 259 | struct perf_sample *sample, |
260 | struct perf_evsel *evsel, | 260 | struct evsel *evsel, |
261 | struct machine *machine) | 261 | struct machine *machine) |
262 | { | 262 | { |
263 | struct perf_annotate *ann = container_of(tool, struct perf_annotate, tool); | 263 | struct perf_annotate *ann = container_of(tool, struct perf_annotate, tool); |
@@ -293,7 +293,7 @@ static int process_feature_event(struct perf_session *session, | |||
293 | } | 293 | } |
294 | 294 | ||
295 | static int hist_entry__tty_annotate(struct hist_entry *he, | 295 | static int hist_entry__tty_annotate(struct hist_entry *he, |
296 | struct perf_evsel *evsel, | 296 | struct evsel *evsel, |
297 | struct perf_annotate *ann) | 297 | struct perf_annotate *ann) |
298 | { | 298 | { |
299 | if (!ann->use_stdio2) | 299 | if (!ann->use_stdio2) |
@@ -303,7 +303,7 @@ static int hist_entry__tty_annotate(struct hist_entry *he, | |||
303 | } | 303 | } |
304 | 304 | ||
305 | static void hists__find_annotations(struct hists *hists, | 305 | static void hists__find_annotations(struct hists *hists, |
306 | struct perf_evsel *evsel, | 306 | struct evsel *evsel, |
307 | struct perf_annotate *ann) | 307 | struct perf_annotate *ann) |
308 | { | 308 | { |
309 | struct rb_node *nd = rb_first_cached(&hists->entries), *next; | 309 | struct rb_node *nd = rb_first_cached(&hists->entries), *next; |
@@ -333,7 +333,7 @@ find_next: | |||
333 | if (use_browser == 2) { | 333 | if (use_browser == 2) { |
334 | int ret; | 334 | int ret; |
335 | int (*annotate)(struct hist_entry *he, | 335 | int (*annotate)(struct hist_entry *he, |
336 | struct perf_evsel *evsel, | 336 | struct evsel *evsel, |
337 | struct hist_browser_timer *hbt); | 337 | struct hist_browser_timer *hbt); |
338 | 338 | ||
339 | annotate = dlsym(perf_gtk_handle, | 339 | annotate = dlsym(perf_gtk_handle, |
@@ -387,7 +387,7 @@ static int __cmd_annotate(struct perf_annotate *ann) | |||
387 | { | 387 | { |
388 | int ret; | 388 | int ret; |
389 | struct perf_session *session = ann->session; | 389 | struct perf_session *session = ann->session; |
390 | struct perf_evsel *pos; | 390 | struct evsel *pos; |
391 | u64 total_nr_samples; | 391 | u64 total_nr_samples; |
392 | 392 | ||
393 | if (ann->cpu_list) { | 393 | if (ann->cpu_list) { |