Merge branch 'linus' into x86/urgent

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / tools / perf / util / hist.h

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 2c6cdae6a764634846a7ed0c29d562e77a346fa1..cb6858a2f9a35df35f6dff6943360f2e76499c5d 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -42,13 +42,10 @@ enum hist_column {
 };
 
 struct hists {
-       struct rb_node          rb_node;
        struct rb_root          entries;
        u64                     nr_entries;
        struct events_stats     stats;
-       u64                     config;
        u64                     event_stream;
-       u32                     type;
        u16                     col_len[HISTC_NR_COLS];
        /* Best would be to reuse the session callchain cursor */
        struct callchain_cursor callchain_cursor;
@@ -78,8 +75,7 @@ size_t hists__fprintf(struct hists *self, struct hists *pair,
                      bool show_displacement, FILE *fp);
 
 int hist_entry__inc_addr_samples(struct hist_entry *self, int evidx, u64 addr);
-int hist_entry__annotate(struct hist_entry *self, struct list_head *head,
-                        size_t privsize);
+int hist_entry__annotate(struct hist_entry *self, size_t privsize);
 
 void hists__filter_by_dso(struct hists *self, const struct dso *dso);
 void hists__filter_by_thread(struct hists *self, const struct thread *thread);
@@ -88,17 +84,12 @@ u16 hists__col_len(struct hists *self, enum hist_column col);
 void hists__set_col_len(struct hists *self, enum hist_column col, u16 len);
 bool hists__new_col_len(struct hists *self, enum hist_column col, u16 len);
 
-#ifdef NO_NEWT_SUPPORT
-static inline int hists__browse(struct hists *self __used,
-                               const char *helpline __used,
-                               const char *ev_name __used, int evidx __used)
-{
-       return 0;
-}
+struct perf_evlist;
 
-static inline int hists__tui_browse_tree(struct rb_root *self __used,
-                                        const char *help __used,
-                                        int evidx __used)
+#ifdef NO_NEWT_SUPPORT
+static inline
+int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __used,
+                                 const char *help __used)
 {
        return 0;
 }
@@ -112,14 +103,12 @@ static inline int hist_entry__tui_annotate(struct hist_entry *self __used,
 #define KEY_RIGHT -2
 #else
 #include <newt.h>
-int hists__browse(struct hists *self, const char *helpline,
-                 const char *ev_name, int evidx);
 int hist_entry__tui_annotate(struct hist_entry *self, int evidx);
 
 #define KEY_LEFT NEWT_KEY_LEFT
 #define KEY_RIGHT NEWT_KEY_RIGHT
 
-int hists__tui_browse_tree(struct rb_root *self, const char *help, int evidx);
+int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help);
 #endif
 
 unsigned int hists__sort_list_width(struct hists *self);