Merge commit 'v2.6.39-rc4' into next

1 files changed, 9 insertions, 3 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 93680818e244..74350ffb57fe 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -245,9 +245,11 @@ static inline struct event *find_cache_event(int type)
         return event;
 }
 
-static void perl_process_event(int cpu, void *data,
-                               int size __unused,
-                               unsigned long long nsecs, char *comm)
+static void perl_process_event(union perf_event *pevent __unused,
+                               struct perf_sample *sample,
+                               struct perf_evsel *evsel,
+                               struct perf_session *session __unused,
+                               struct thread *thread)
 {
         struct format_field *field;
         static char handler[256];
@@ -256,6 +258,10 @@ static void perl_process_event(int cpu, void *data,
         struct event *event;
         int type;
         int pid;
+        int cpu = sample->cpu;
+        void *data = sample->raw_data;
+        unsigned long long nsecs = sample->time;
+        char *comm = thread->comm;
 
         dSP;