Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[cascardo/linux.git] / tools / perf / builtin-report.c

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index b9e046b..6e88460 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -935,7 +935,6 @@ repeat:
 
        if (symbol_conf.report_hierarchy) {
                /* disable incompatible options */
-               symbol_conf.event_group = false;
                symbol_conf.cumulate_callchain = false;
 
                if (field_order) {
@@ -984,9 +983,9 @@ repeat:
         * implementation.
         */
        if (ui__has_annotation()) {
-               symbol_conf.priv_size = sizeof(struct annotation);
-               machines__set_symbol_filter(&session->machines,
-                                           symbol__annotate_init);
+               ret = symbol__annotation_init();
+               if (ret < 0)
+                       goto error;
                /*
                 * For searching by name on the "Browse map details".
                 * providing it only in verbose mode not to bloat too