diff options
author | Borislav Petkov <bp@suse.de> | 2021-03-15 10:49:00 +0100 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-03-15 10:49:00 +0100 |
commit | aa7680f6fe21ba92c3d633e345f85d4125cd56f1 (patch) | |
tree | 238310342ae16eb5a2cdc9e032d972936cc3fe77 /tools/perf/tests/code-reading.c | |
parent | d0962f2b24c99889a386f0658c71535f56358f77 (diff) | |
parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
download | linux-aa7680f6fe21ba92c3d633e345f85d4125cd56f1.tar.gz linux-aa7680f6fe21ba92c3d633e345f85d4125cd56f1.tar.bz2 linux-aa7680f6fe21ba92c3d633e345f85d4125cd56f1.zip |
Merge tag 'v5.12-rc3' into x86/core
Pick up dependent SEV-ES urgent changes to base new work ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'tools/perf/tests/code-reading.c')
-rw-r--r-- | tools/perf/tests/code-reading.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index 280f0348a09c..2fdc7b2f996e 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -706,13 +706,9 @@ static int do_test_code_reading(bool try_kcore) out_put: thread__put(thread); out_err: - - if (evlist) { - evlist__delete(evlist); - } else { - perf_cpu_map__put(cpus); - perf_thread_map__put(threads); - } + evlist__delete(evlist); + perf_cpu_map__put(cpus); + perf_thread_map__put(threads); machine__delete_threads(machine); machine__delete(machine); |