diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 15:46:58 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 15:48:06 -0400 |
| commit | 2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch) | |
| tree | bfe1707dda7e755b8b550c6796e2649813bcfbb9 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | 36885ff0e6563687e6152da6d311abbf83c0198f (diff) | |
| parent | 7b7adc4a016a1decb806eb71ecab98721fa7f146 (diff) | |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index c6d99334bdfa..2040b8538527 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
| @@ -248,8 +248,7 @@ static void python_process_event(int cpu, void *data, | |||
| 248 | context = PyCObject_FromVoidPtr(scripting_context, NULL); | 248 | context = PyCObject_FromVoidPtr(scripting_context, NULL); |
| 249 | 249 | ||
| 250 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); | 250 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); |
| 251 | PyTuple_SetItem(t, n++, | 251 | PyTuple_SetItem(t, n++, context); |
| 252 | PyCObject_FromVoidPtr(scripting_context, NULL)); | ||
| 253 | 252 | ||
| 254 | if (handler) { | 253 | if (handler) { |
| 255 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); | 254 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); |