diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-04 02:27:12 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-04 02:27:12 +0200 |
| commit | f29135ee4e0d4e01911ed569f731bfdb841cea6d (patch) | |
| tree | e72d49a2f677dd069c3a673522cf785548148f71 /tools/testing/selftests/vm/userfaultfd.c | |
| parent | Merge tag 'drm-misc-next-2018-06-27' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-f29135ee4e0d4e01911ed569f731bfdb841cea6d.tar.xz linux-f29135ee4e0d4e01911ed569f731bfdb841cea6d.zip | |
Merge v4.18-rc3 into drm-next
Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/testing/selftests/vm/userfaultfd.c')
| -rw-r--r-- | tools/testing/selftests/vm/userfaultfd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index de2f9ec8a87f..7b8171e3128a 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -69,6 +69,8 @@ #include <setjmp.h> #include <stdbool.h> +#include "../kselftest.h" + #ifdef __NR_userfaultfd static unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size; @@ -1322,7 +1324,7 @@ int main(int argc, char **argv) int main(void) { printf("skip: Skipping userfaultfd test (missing __NR_userfaultfd)\n"); - return 0; + return KSFT_SKIP; } #endif /* __NR_userfaultfd */ |