diff options
author | 2023-07-24 15:44:47 +0200 | |
---|---|---|
committer | 2023-07-24 15:44:47 +0200 | |
commit | 61b7369483efb5e0a9f3b48e75fac00d46d661e0 (patch) | |
tree | 6a97cc6f8857f0d26dcd48627aa6f31b9875b07e /tools/perf/scripts/python/Perf-Trace-Util | |
parent | drm/managed: Clean up GFP_ flag usage in drmm_kmalloc() (diff) | |
parent | Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
download | wireguard-linux-61b7369483efb5e0a9f3b48e75fac00d46d661e0.tar.xz wireguard-linux-61b7369483efb5e0a9f3b48e75fac00d46d661e0.zip |
Merge drm/drm-next into drm-misc-next
Backmerging to get v6.5-rc2.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util')
-rw-r--r-- | tools/perf/scripts/python/Perf-Trace-Util/Context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c index 53b1587db403..3954bd1587ce 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c @@ -100,8 +100,8 @@ static PyObject *perf_sample_insn(PyObject *obj, PyObject *args) if (!c) return NULL; - if (c->sample->ip && !c->sample->insn_len && c->al->thread->maps) { - struct machine *machine = maps__machine(c->al->thread->maps); + if (c->sample->ip && !c->sample->insn_len && thread__maps(c->al->thread)) { + struct machine *machine = maps__machine(thread__maps(c->al->thread)); script_fetch_insn(c->sample, c->al->thread, machine); } |