diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-10 21:35:41 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-10 21:35:41 +0300 |
| commit | debe70e488968e82282db48fbbcf84b5080f742c (patch) | |
| tree | 90f96f07c499bfc5bdbbeab3ca4a81a5a7672b61 /tools/testing/selftests/arm64/signal/test_signals_utils.c | |
| parent | 65f8d08cf838df3c3d728cdef908090237931496 (diff) | |
| parent | 133d9c53c9dcbb1b8f317e402e79c44d9eb725c9 (diff) | |
| download | linux-debe70e488968e82282db48fbbcf84b5080f742c.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/testing/selftests/arm64/signal/test_signals_utils.c')
| -rw-r--r-- | tools/testing/selftests/arm64/signal/test_signals_utils.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/testing/selftests/arm64/signal/test_signals_utils.c b/tools/testing/selftests/arm64/signal/test_signals_utils.c index 22722abc9dfa..2f8c23af3b5e 100644 --- a/tools/testing/selftests/arm64/signal/test_signals_utils.c +++ b/tools/testing/selftests/arm64/signal/test_signals_utils.c @@ -310,14 +310,12 @@ int test_setup(struct tdescr *td) int test_run(struct tdescr *td) { - if (td->sig_trig) { - if (td->trigger) - return td->trigger(td); - else - return default_trigger(td); - } else { + if (td->trigger) + return td->trigger(td); + else if (td->sig_trig) + return default_trigger(td); + else return td->run(td, NULL, NULL); - } } void test_result(struct tdescr *td) |