Merge tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / tools / perf / util / evsel_fprintf.c

diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c
index 496fec0..028df7a 100644 (file)
--- a/tools/perf/util/evsel_fprintf.c
+++ b/tools/perf/util/evsel_fprintf.c
@@ -4,6 +4,8 @@
 #include <stdbool.h>
 #include <traceevent/event-parse.h>
 #include "evsel.h"
+#include "util/evsel_fprintf.h"
+#include "util/event.h"
 #include "callchain.h"
 #include "map.h"
 #include "strlist.h"
@@ -101,7 +103,7 @@ out:
 
 int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
                              unsigned int print_opts, struct callchain_cursor *cursor,
-                             FILE *fp)
+                             struct strlist *bt_stop_list, FILE *fp)
 {
        int printed = 0;
        struct callchain_cursor_node *node;
@@ -174,10 +176,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
                                printed += fprintf(fp, "\n");
 
                        /* Add srccode here too? */
-                       if (symbol_conf.bt_stop_list &&
-                           node->sym &&
-                           strlist__has_entry(symbol_conf.bt_stop_list,
-                                              node->sym->name)) {
+                       if (bt_stop_list && node->sym &&
+                           strlist__has_entry(bt_stop_list, node->sym->name)) {
                                break;
                        }
 
@@ -192,7 +192,7 @@ next:
 
 int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,
                        int left_alignment, unsigned int print_opts,
-                       struct callchain_cursor *cursor, FILE *fp)
+                       struct callchain_cursor *cursor, struct strlist *bt_stop_list, FILE *fp)
 {
        int printed = 0;
        int print_ip = print_opts & EVSEL__PRINT_IP;
@@ -203,8 +203,8 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,
        int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR;
 
        if (cursor != NULL) {
-               printed += sample__fprintf_callchain(sample, left_alignment,
-                                                    print_opts, cursor, fp);
+               printed += sample__fprintf_callchain(sample, left_alignment, print_opts,
+                                                    cursor, bt_stop_list, fp);
        } else {
                printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");