Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / tools / perf / ui / gtk / annotate.c

diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index 3af87c18a914f738259d8474fb0105a956224d7d..8e744af24f7c83e29fb95dca94f979a49adae7e1 100644 (file)
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -5,6 +5,7 @@
 #include "util/annotate.h"
 #include "util/evsel.h"
 #include "util/map.h"
+#include "util/dso.h"
 #include "util/symbol.h"
 #include "ui/helpline.h"
 #include <inttypes.h>
@@ -91,7 +92,7 @@ static int perf_gtk__get_line(char *buf, size_t size, struct disasm_line *dl)
 }
 
 static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
-                               struct map *map, struct perf_evsel *evsel,
+                               struct map *map, struct evsel *evsel,
                                struct hist_browser_timer *hbt __maybe_unused)
 {
        struct disasm_line *pos, *n;
@@ -129,7 +130,7 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
                gtk_list_store_append(store, &iter);
 
                if (perf_evsel__is_group_event(evsel)) {
-                       for (i = 0; i < evsel->nr_members; i++) {
+                       for (i = 0; i < evsel->core.nr_members; i++) {
                                ret += perf_gtk__get_percent(s + ret,
                                                             sizeof(s) - ret,
                                                             sym, pos,
@@ -160,7 +161,7 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
 }
 
 static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
-                               struct perf_evsel *evsel,
+                               struct evsel *evsel,
                                struct hist_browser_timer *hbt)
 {
        GtkWidget *window;
@@ -238,7 +239,7 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
 }
 
 int hist_entry__gtk_annotate(struct hist_entry *he,
-                            struct perf_evsel *evsel,
+                            struct evsel *evsel,
                             struct hist_browser_timer *hbt)
 {
        return symbol__gtk_annotate(he->ms.sym, he->ms.map, evsel, hbt);