diff options
| author | Andrew Morton | 2023-10-18 14:32:58 -0700 |
|---|---|---|
| committer | Andrew Morton | 2023-10-18 14:32:58 -0700 |
| commit | 5ef8f1b2b4d9bd02e4104b9255351fb9279b1b4e (patch) | |
| tree | 415dc49e56338e498bff9a3b0c5b99b049890e14 /tools/testing | |
| parent | b0540208a59e11ab55c9b857bf521d8846e515bf (diff) | |
| parent | fc7f04dc23db50206bee7891516ed4726c3f64cf (diff) | |
Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/clone3/clone3.c | 7 | ||||
| -rw-r--r-- | tools/testing/selftests/mm/mremap_dontunmap.c | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selftests/clone3/clone3.c index e60cf4da8fb0..1c61e3c022cb 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -196,7 +196,12 @@ int main(int argc, char *argv[]) CLONE3_ARGS_NO_TEST); /* Do a clone3() in a new time namespace */ - test_clone3(CLONE_NEWTIME, 0, 0, CLONE3_ARGS_NO_TEST); + if (access("/proc/self/ns/time", F_OK) == 0) { + test_clone3(CLONE_NEWTIME, 0, 0, CLONE3_ARGS_NO_TEST); + } else { + ksft_print_msg("Time namespaces are not supported\n"); + ksft_test_result_skip("Skipping clone3() with CLONE_NEWTIME\n"); + } /* Do a clone3() with exit signal (SIGCHLD) in flags */ test_clone3(SIGCHLD, 0, -EINVAL, CLONE3_ARGS_NO_TEST); diff --git a/tools/testing/selftests/mm/mremap_dontunmap.c b/tools/testing/selftests/mm/mremap_dontunmap.c index ca2359835e75..a06e73ec8568 100644 --- a/tools/testing/selftests/mm/mremap_dontunmap.c +++ b/tools/testing/selftests/mm/mremap_dontunmap.c @@ -7,6 +7,7 @@ */ #define _GNU_SOURCE #include <sys/mman.h> +#include <linux/mman.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> |