Merge tag 'kvm-arm-for-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / hist.h

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 5ed8d9c229814d9c6942ce3528898bbd9de1cb79..de6d58e7f0d561db9e204939453a5ca8b6a9cc11 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -30,6 +30,7 @@ enum hist_column {
        HISTC_PARENT,
        HISTC_CPU,
        HISTC_SRCLINE,
+       HISTC_SRCFILE,
        HISTC_MISPREDICT,
        HISTC_IN_TX,
        HISTC_ABORT,
@@ -47,6 +48,7 @@ enum hist_column {
        HISTC_MEM_SNOOP,
        HISTC_MEM_DCACHELINE,
        HISTC_TRANSACTION,
+       HISTC_CYCLES,
        HISTC_NR_COLS, /* Last entry */
 };
 
@@ -311,7 +313,7 @@ int hist_entry__tui_annotate(struct hist_entry *he, struct perf_evsel *evsel,
 int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
                                  struct hist_browser_timer *hbt,
                                  float min_pcnt,
-                                 struct perf_session_env *env);
+                                 struct perf_env *env);
 int script_browse(const char *script_opt);
 #else
 static inline
@@ -319,7 +321,7 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused,
                                  const char *help __maybe_unused,
                                  struct hist_browser_timer *hbt __maybe_unused,
                                  float min_pcnt __maybe_unused,
-                                 struct perf_session_env *env __maybe_unused)
+                                 struct perf_env *env __maybe_unused)
 {
        return 0;
 }
@@ -349,6 +351,9 @@ static inline int script_browse(const char *script_opt __maybe_unused)
 
 unsigned int hists__sort_list_width(struct hists *hists);
 
+void hist__account_cycles(struct branch_stack *bs, struct addr_location *al,
+                         struct perf_sample *sample, bool nonany_branch_mode);
+
 struct option;
 int parse_filter_percentage(const struct option *opt __maybe_unused,
                            const char *arg, int unset __maybe_unused);