Merge tag 'Smack-for-5.15' of git://github.com/cschaufler/smack-next

[linux-2.6-microblaze.git] / tools / perf / builtin-top.c

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 2d570bf..02f8bb5 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -264,9 +264,9 @@ static void perf_top__show_details(struct perf_top *top)
 
        if (top->evlist->enabled) {
                if (top->zero)
-                       symbol__annotate_zero_histogram(symbol, top->sym_evsel->idx);
+                       symbol__annotate_zero_histogram(symbol, top->sym_evsel->core.idx);
                else
-                       symbol__annotate_decay_histogram(symbol, top->sym_evsel->idx);
+                       symbol__annotate_decay_histogram(symbol, top->sym_evsel->core.idx);
        }
        if (more != 0)
                printf("%d lines not displayed, maybe increase display entries [e]\n", more);
@@ -301,7 +301,7 @@ static void perf_top__resort_hists(struct perf_top *t)
 
                /* Non-group events are considered as leader */
                if (symbol_conf.event_group && !evsel__is_group_leader(pos)) {
-                       struct hists *leader_hists = evsel__hists(pos->leader);
+                       struct hists *leader_hists = evsel__hists(evsel__leader(pos));
 
                        hists__match(leader_hists, hists);
                        hists__link(leader_hists, hists);
@@ -530,7 +530,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
                                fprintf(stderr, "\nAvailable events:");
 
                                evlist__for_each_entry(top->evlist, top->sym_evsel)
-                                       fprintf(stderr, "\n\t%d %s", top->sym_evsel->idx, evsel__name(top->sym_evsel));
+                                       fprintf(stderr, "\n\t%d %s", top->sym_evsel->core.idx, evsel__name(top->sym_evsel));
 
                                prompt_integer(&counter, "Enter details event counter");
 
@@ -541,7 +541,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
                                        break;
                                }
                                evlist__for_each_entry(top->evlist, top->sym_evsel)
-                                       if (top->sym_evsel->idx == counter)
+                                       if (top->sym_evsel->core.idx == counter)
                                                break;
                        } else
                                top->sym_evsel = evlist__first(top->evlist);