1 files changed, 12 insertions, 11 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 150a606002e..5f40df635dc 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -63,7 +63,8 @@ static int cleanup_scripting(void)
 
 static char const               *input_name = "perf.data";
 
-static int process_sample_event(event_t *event, struct sample_data *sample,
+static int process_sample_event(union perf_event *event,
+                                struct perf_sample *sample,
                                 struct perf_session *session)
 {
         struct thread *thread = perf_session__findnew(session, event->ip.pid);
@@ -77,8 +78,8 @@ static int process_sample_event(event_t *event, struct sample_data *sample,
         if (session->sample_type & PERF_SAMPLE_RAW) {
                 if (debug_mode) {
                         if (sample->time < last_timestamp) {
-                                pr_err("Samples misordered, previous: %llu "
-                                        "this: %llu\n", last_timestamp,
+                                pr_err("Samples misordered, previous: %" PRIu64
+                                        " this: %" PRIu64 "\n", last_timestamp,
                                         sample->time);
                                 nr_unordered++;
                         }
@@ -100,14 +101,14 @@ static int process_sample_event(event_t *event, struct sample_data *sample,
 }
 
 static struct perf_event_ops event_ops = {
-        .sample = process_sample_event,
-        .comm   = event__process_comm,
-        .attr   = event__process_attr,
-        .event_type = event__process_event_type,
-        .tracing_data = event__process_tracing_data,
-        .build_id = event__process_build_id,
-        .ordering_requires_timestamps = true,
+        .sample          = process_sample_event,
+        .comm            = perf_event__process_comm,
+        .attr            = perf_event__process_attr,
+        .event_type      = perf_event__process_event_type,
+        .tracing_data    = perf_event__process_tracing_data,
+        .build_id        = perf_event__process_build_id,
         .ordered_samples = true,
+        .ordering_requires_timestamps = true,
 };
 
 extern volatile int session_done;
@@ -126,7 +127,7 @@ static int __cmd_script(struct perf_session *session)
         ret = perf_session__process_events(session, &event_ops);
 
         if (debug_mode)
-                pr_err("Misordered timestamps: %llu\n", nr_unordered);
+                pr_err("Misordered timestamps: %" PRIu64 "\n", nr_unordered);
 
         return ret;
 }