Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / tools / perf / util / trace-event-scripting.c

diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 474aa7a..8715a10 100644 (file)
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -35,12 +35,11 @@ static int stop_script_unsupported(void)
        return 0;
 }
 
-static void process_event_unsupported(union perf_event *event __unused,
-                                     struct pevent *pevent __unused,
-                                     struct perf_sample *sample __unused,
-                                     struct perf_evsel *evsel __unused,
-                                     struct machine *machine __unused,
-                                     struct thread *thread __unused)
+static void process_event_unsupported(union perf_event *event __maybe_unused,
+                                     struct perf_sample *sample __maybe_unused,
+                                     struct perf_evsel *evsel __maybe_unused,
+                                     struct machine *machine __maybe_unused,
+                                     struct addr_location *al __maybe_unused)
 {
 }
 
@@ -53,17 +52,19 @@ static void print_python_unsupported_msg(void)
                "\n  etc.\n");
 }
 
-static int python_start_script_unsupported(const char *script __unused,
-                                          int argc __unused,
-                                          const char **argv __unused)
+static int python_start_script_unsupported(const char *script __maybe_unused,
+                                          int argc __maybe_unused,
+                                          const char **argv __maybe_unused)
 {
        print_python_unsupported_msg();
 
        return -1;
 }
 
-static int python_generate_script_unsupported(struct pevent *pevent __unused,
-                                             const char *outfile __unused)
+static int python_generate_script_unsupported(struct pevent *pevent
+                                             __maybe_unused,
+                                             const char *outfile
+                                             __maybe_unused)
 {
        print_python_unsupported_msg();
 
@@ -115,17 +116,18 @@ static void print_perl_unsupported_msg(void)
                "\n  etc.\n");
 }
 
-static int perl_start_script_unsupported(const char *script __unused,
-                                        int argc __unused,
-                                        const char **argv __unused)
+static int perl_start_script_unsupported(const char *script __maybe_unused,
+                                        int argc __maybe_unused,
+                                        const char **argv __maybe_unused)
 {
        print_perl_unsupported_msg();
 
        return -1;
 }
 
-static int perl_generate_script_unsupported(struct pevent *pevent __unused,
-                                           const char *outfile __unused)
+static int perl_generate_script_unsupported(struct pevent *pevent
+                                           __maybe_unused,
+                                           const char *outfile __maybe_unused)
 {
        print_perl_unsupported_msg();