Merge branch 'for-3.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / scripting-engines / trace-event-perl.c

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index e30749e38a9b72d30d86486cc91924e10f6f15dc..4c1b3d72a1d2d24093733018674024e42723a548 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -56,7 +56,7 @@ INTERP my_perl;
 #define FTRACE_MAX_EVENT                               \
        ((1 << (sizeof(unsigned short) * 8)) - 1)
 
-struct event *events[FTRACE_MAX_EVENT];
+struct event_format *events[FTRACE_MAX_EVENT];
 
 extern struct scripting_context *scripting_context;
 
@@ -181,7 +181,7 @@ static void define_flag_field(const char *ev_name,
        LEAVE;
 }
 
-static void define_event_symbols(struct event *event,
+static void define_event_symbols(struct event_format *event,
                                 const char *ev_name,
                                 struct print_arg *args)
 {
@@ -209,6 +209,8 @@ static void define_event_symbols(struct event *event,
                define_symbolic_values(args->symbol.symbols, ev_name,
                                       cur_field_name);
                break;
+       case PRINT_BSTRING:
+       case PRINT_DYNAMIC_ARRAY:
        case PRINT_STRING:
                break;
        case PRINT_TYPE:
@@ -220,7 +222,9 @@ static void define_event_symbols(struct event *event,
                define_event_symbols(event, ev_name, args->op.left);
                define_event_symbols(event, ev_name, args->op.right);
                break;
+       case PRINT_FUNC:
        default:
+               pr_err("Unsupported print arg type\n");
                /* we should warn... */
                return;
        }
@@ -229,10 +233,10 @@ static void define_event_symbols(struct event *event,
                define_event_symbols(event, ev_name, args->next);
 }
 
-static inline struct event *find_cache_event(int type)
+static inline struct event_format *find_cache_event(int type)
 {
        static char ev_name[256];
-       struct event *event;
+       struct event_format *event;
 
        if (events[type])
                return events[type];
@@ -258,7 +262,7 @@ static void perl_process_tracepoint(union perf_event *pevent __unused,
        static char handler[256];
        unsigned long long val;
        unsigned long s, ns;
-       struct event *event;
+       struct event_format *event;
        int type;
        int pid;
        int cpu = sample->cpu;
@@ -446,7 +450,7 @@ static int perl_stop_script(void)
 
 static int perl_generate_script(const char *outfile)
 {
-       struct event *event = NULL;
+       struct event_format *event = NULL;
        struct format_field *f;
        char fname[PATH_MAX];
        int not_first, count;