Merge branch 'next' into for-linus

Prepare input updates for 3.16.

1 files changed, 3 insertions, 10 deletions

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index e4e6249b87d4..f38590d7561b 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -13,13 +13,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists,
 static bool hists__filter_entry_by_symbol(struct hists *hists,
                                           struct hist_entry *he);
 
-enum hist_filter {
-        HIST_FILTER__DSO,
-        HIST_FILTER__THREAD,
-        HIST_FILTER__PARENT,
-        HIST_FILTER__SYMBOL,
-};
-
 struct callchain_param  callchain_param = {
         .mode   = CHAIN_GRAPH_REL,
         .min_percent = 0.5,
@@ -290,7 +283,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
                 if (he->branch_info) {
                         /*
                          * This branch info is (a part of) allocated from
-                         * machine__resolve_bstack() and will be freed after
+                         * sample__resolve_bstack() and will be freed after
                          * adding new entries.  So we need to save a copy.
                          */
                         he->branch_info = malloc(sizeof(*he->branch_info));
@@ -369,7 +362,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
                         he_stat__add_period(&he->stat, period, weight);
 
                         /*
-                         * This mem info was allocated from machine__resolve_mem
+                         * This mem info was allocated from sample__resolve_mem
                          * and will not be used anymore.
                          */
                         zfree(&entry->mem_info);
@@ -429,7 +422,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
                         .weight = weight,
                 },
                 .parent = sym_parent,
-                .filtered = symbol__parent_filter(sym_parent),
+                .filtered = symbol__parent_filter(sym_parent) | al->filtered,
                 .hists  = hists,
                 .branch_info = bi,
                 .mem_info = mi,