diff options
author | James Morris <james.l.morris@oracle.com> | 2013-03-11 12:54:48 +1100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2013-03-11 12:54:48 +1100 |
commit | 2c4cdf5950b1a7a9d731c03c56e2cea3bd8ca7b7 (patch) | |
tree | ed0cdc81e72343132da9f52620ec40391f6dcbed /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | 5b2660326039a32b28766cb4c1a8b1bdcfadc375 (diff) | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) |
Merge tag 'v3.9-rc2' into next
Sync with Linus.
Linux 3.9-rc2
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 14683dfca2e..e87aa5d9696 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -265,6 +265,7 @@ static void python_process_tracepoint(union perf_event *perf_event ns = nsecs - s * NSECS_PER_SEC; scripting_context->event_data = data; + scripting_context->pevent = evsel->tp_format->pevent; context = PyCObject_FromVoidPtr(scripting_context, NULL); |