diff options
author | 2013-03-18 10:57:32 +0100 | |
---|---|---|
committer | 2013-03-18 10:57:57 +0100 | |
commit | aa1262b3876ec5249ff464618a7dcd46b3ca54e2 (patch) | |
tree | b150bb2c83c073e1f0e298ba7899148f7d991ef7 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | sfc: Fix Kconfig typo "----help---" (diff) | |
parent | Linux 3.9-rc1 (diff) | |
download | linux-dev-aa1262b3876ec5249ff464618a7dcd46b3ca54e2.tar.xz linux-dev-aa1262b3876ec5249ff464618a7dcd46b3ca54e2.zip |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to the newly
added ITG-3200 driver.
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 14683dfca2ee..e87aa5d9696b 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); |