diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-14 11:43:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-14 11:43:47 -0700 |
| commit | 2fe1020d73ca0467b5383b0a3e459a1d29902762 (patch) | |
| tree | 0519b55aec95603809ccc50058bc385b17d6d0e7 /tools/perf | |
| parent | Merge tag 'drm-fixes-2022-05-14' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | MAINTAINERS: Add James and Mike as Arm64 performance events reviewers (diff) | |
| download | linux-2fe1020d73ca0467b5383b0a3e459a1d29902762.tar.gz linux-2fe1020d73ca0467b5383b0a3e459a1d29902762.zip | |
Merge tag 'perf-tools-fixes-for-v5.18-2022-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
Pull perf tools fixes from Arnaldo Carvalho de Melo:
- Fix two NDEBUG warnings in 'perf bench numa'
- Fix ARM coresight `perf test` failure
- Sync linux/kvm.h with the kernel sources
- Add James and Mike as Arm64 performance events reviewers
* tag 'perf-tools-fixes-for-v5.18-2022-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
MAINTAINERS: Add James and Mike as Arm64 performance events reviewers
tools headers UAPI: Sync linux/kvm.h with the kernel sources
perf tests: Fix coresight `perf test` failure.
perf bench: Fix two numa NDEBUG warnings
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/bench/numa.c | 2 | ||||
| -rwxr-xr-x | tools/perf/tests/shell/test_arm_coresight.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 44e1f8a44087..d5289fa58a4f 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -311,6 +311,7 @@ err_out: /* BUG_ON due to failure in allocation of orig_mask/mask */ BUG_ON(-1); + return NULL; } static cpu_set_t *bind_to_node(int target_node) @@ -364,6 +365,7 @@ err_out: /* BUG_ON due to failure in allocation of orig_mask/mask */ BUG_ON(-1); + return NULL; } static void bind_to_cpumask(cpu_set_t *mask) diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh index 6de53b7ef5ff..e4cb4f1806ff 100755 --- a/tools/perf/tests/shell/test_arm_coresight.sh +++ b/tools/perf/tests/shell/test_arm_coresight.sh @@ -29,7 +29,6 @@ cleanup_files() rm -f ${file} rm -f "${perfdata}.old" trap - exit term int - kill -2 $$ exit $glb_err } |