diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-18 05:57:32 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-18 05:57:57 -0400 |
| commit | aa1262b3876ec5249ff464618a7dcd46b3ca54e2 (patch) | |
| tree | b150bb2c83c073e1f0e298ba7899148f7d991ef7 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | 806b2139db236e0cbd0b5833ab0ce139f0196bcd (diff) | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
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 | |||
| 265 | ns = nsecs - s * NSECS_PER_SEC; | 265 | ns = nsecs - s * NSECS_PER_SEC; |
| 266 | 266 | ||
| 267 | scripting_context->event_data = data; | 267 | scripting_context->event_data = data; |
| 268 | scripting_context->pevent = evsel->tp_format->pevent; | ||
| 268 | 269 | ||
| 269 | context = PyCObject_FromVoidPtr(scripting_context, NULL); | 270 | context = PyCObject_FromVoidPtr(scripting_context, NULL); |
| 270 | 271 | ||