diff options
author | 2019-05-20 11:54:11 +0100 | |
---|---|---|
committer | 2019-05-20 11:54:11 +0100 | |
commit | 96d82e9d0dc799bb382ed0fe9db30c79c3a9f3b9 (patch) | |
tree | 76a630c2f0c84d807cc2c6199be24519ecc9ec16 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | dt-bindings: regulator: add document bindings for slg51000 (diff) | |
parent | Linux 5.2-rc1 (diff) | |
download | linux-rng-96d82e9d0dc799bb382ed0fe9db30c79c3a9f3b9.tar.xz linux-rng-96d82e9d0dc799bb382ed0fe9db30c79c3a9f3b9.zip |
Merge tag 'v5.2-rc1' into regulator-5.3
Linux 5.2-rc1
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 09604c6508f0..22f52b669871 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample, ns = nsecs - s * NSEC_PER_SEC; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep; context = _PyCapsule_New(scripting_context, NULL, NULL); |