diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-06-17 19:20:14 +0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-06-17 19:20:14 +0300 |
commit | 08a7c7772b4db0be06e3b27239147c0a36e2a507 (patch) | |
tree | af653cb85a263ac19334cdaa74ecd58f909c5cef /tools/testing/selftests/timens/timens.c | |
parent | b13b04d9382113f787e21c9567a4022fef8697b9 (diff) | |
parent | 69119673bd50b176ded34032fadd41530fb5af21 (diff) |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To get some newer headers that got out of sync with the copies in tools/
so that we can try to have the tools/perf/ build clean for v5.8 with
fewer pull requests.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/testing/selftests/timens/timens.c')
-rw-r--r-- | tools/testing/selftests/timens/timens.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/timens/timens.c b/tools/testing/selftests/timens/timens.c index 098be7c83be3..52b6a1185f52 100644 --- a/tools/testing/selftests/timens/timens.c +++ b/tools/testing/selftests/timens/timens.c @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) nscheck(); - check_config_posix_timers(); + check_supported_timers(); ksft_set_plan(ARRAY_SIZE(clocks) * 2); |