Merge tag 'v2.6.39-rc7'

in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.

1 files changed, 12 insertions, 7 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 33a632523743..6ccf70e8d8f2 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -204,9 +204,11 @@ static inline struct event *find_cache_event(int type)
         return event;
 }
 
-static void python_process_event(int cpu, void *data,
-                                 int size __unused,
-                                 unsigned long long nsecs, char *comm)
+static void python_process_event(union perf_event *pevent __unused,
+                                 struct perf_sample *sample,
+                                 struct perf_evsel *evsel __unused,
+                                 struct perf_session *session __unused,
+                                 struct thread *thread)
 {
         PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;
         static char handler_name[256];
@@ -217,6 +219,10 @@ static void python_process_event(int cpu, void *data,
         unsigned n = 0;
         int type;
         int pid;
+        int cpu = sample->cpu;
+        void *data = sample->raw_data;
+        unsigned long long nsecs = sample->time;
+        char *comm = thread->comm;
 
         t = PyTuple_New(MAX_FIELDS);
         if (!t)
@@ -248,8 +254,7 @@ static void python_process_event(int cpu, void *data,
         context = PyCObject_FromVoidPtr(scripting_context, NULL);
 
         PyTuple_SetItem(t, n++, PyString_FromString(handler_name));
-        PyTuple_SetItem(t, n++,
-                        PyCObject_FromVoidPtr(scripting_context, NULL));
+        PyTuple_SetItem(t, n++, context);
 
         if (handler) {
                 PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));
@@ -442,8 +447,8 @@ static int python_generate_script(const char *outfile)
                 fprintf(stderr, "couldn't open %s\n", fname);
                 return -1;
         }
-        fprintf(ofp, "# perf trace event handlers, "
-                "generated by perf trace -g python\n");
+        fprintf(ofp, "# perf script event handlers, "
+                "generated by perf script -g python\n");
 
         fprintf(ofp, "# Licensed under the terms of the GNU GPL"
                 " License version 2\n\n");