tests: use scno.h in tests of relatively new syscalls

* tests/add_key.c: Include "scno.h" after <asm/unistd.h>.
* tests/copy_file_range.c: Likewise.
* tests/execveat.c: Likewise.
* tests/kexec_file_load.c: Likewise.
* tests/membarrier.c: Likewise.
* tests/memfd_create.c: Likewise.
* tests/mlock2.c: Likewise.
* tests/pkey_alloc.c: Likewise.
* tests/pkey_free.c: Likewise.
* tests/pkey_mprotect.c: Likewise.
* tests/preadv2-pwritev2.c: Likewise.
* tests/userfaultfd.c: Likewise.

diff --git a/tests/add_key.c b/tests/add_key.c
index 56c505dd5508daee629bd9eaf6023e04785fd946..d2696f9bc310b500f5d56539a04df6dc9cb6a6c7 100644 (file)
--- a/tests/add_key.c
+++ b/tests/add_key.c
@@ -28,8 +28,8 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_add_key
 

diff --git a/tests/copy_file_range.c b/tests/copy_file_range.c
index f3ec5b4a247a05ba1e4128c2920e423b552e3b86..085010af0e98b13b47cf19cd8916796493677627 100644 (file)
--- a/tests/copy_file_range.c
+++ b/tests/copy_file_range.c
@@ -29,6 +29,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #if defined __NR_copy_file_range
 

diff --git a/tests/execveat.c b/tests/execveat.c
index 4e444a2c39dcd56c9eacc3cb58f20faa4c2a2d28..9083830eb54e7c532e56a4a737315af3dd10d342 100644 (file)
--- a/tests/execveat.c
+++ b/tests/execveat.c
@@ -28,12 +28,14 @@
  */
 
 #include "tests.h"
-#include <stdio.h>
-#include <unistd.h>
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_execveat
 
+# include <stdio.h>
+# include <unistd.h>
+
 # define FILENAME "test.execveat\nfilename"
 # define Q_FILENAME "test.execveat\\nfilename"
 

diff --git a/tests/kexec_file_load.c b/tests/kexec_file_load.c
index b44cbce226d98358caccbe44e2e7bcacaf425094..3d46d38ed339d166211465358df1c8154c0a4e00 100644 (file)
--- a/tests/kexec_file_load.c
+++ b/tests/kexec_file_load.c
@@ -28,8 +28,8 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_kexec_file_load
 

diff --git a/tests/membarrier.c b/tests/membarrier.c
index cde8f329d661595fed1597dfb5b868f4047dd4ee..330893b6c2c23c0992d2b38abd84fdfd641cd4a6 100644 (file)
--- a/tests/membarrier.c
+++ b/tests/membarrier.c
@@ -27,6 +27,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_membarrier
 

diff --git a/tests/memfd_create.c b/tests/memfd_create.c
index ef49bed15d99015b8a94d55030d013a49514c1ed..480fd17713408686e729cb67e1ba30db03500b2f 100644 (file)
--- a/tests/memfd_create.c
+++ b/tests/memfd_create.c
@@ -1,5 +1,6 @@
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_memfd_create
 

diff --git a/tests/mlock2.c b/tests/mlock2.c
index e557042ec872ea1dceee1e07255da01b52721eed..71a2003eae18841e5a4c3d5a1fd9813f1a32ad05 100644 (file)
--- a/tests/mlock2.c
+++ b/tests/mlock2.c
@@ -27,6 +27,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_mlock2
 

diff --git a/tests/pkey_alloc.c b/tests/pkey_alloc.c
index 19840f24b30e537ace224b52535fcdba2ee7c21d..457727873314126101d4ead5a16d692d93b0c697 100644 (file)
--- a/tests/pkey_alloc.c
+++ b/tests/pkey_alloc.c
@@ -28,10 +28,10 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
-#if defined __NR_pkey_alloc
+#ifdef __NR_pkey_alloc
 
 # include <stdio.h>
 # include <unistd.h>

diff --git a/tests/pkey_free.c b/tests/pkey_free.c
index 1815ad9f4840b12810b2daba47894ae2720e6cab..95a2ad263e74b8323f83d3e42a6ac3160207cae9 100644 (file)
--- a/tests/pkey_free.c
+++ b/tests/pkey_free.c
@@ -28,10 +28,10 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
-#if defined __NR_pkey_free
+#ifdef __NR_pkey_free
 
 # include <stdio.h>
 # include <unistd.h>

diff --git a/tests/pkey_mprotect.c b/tests/pkey_mprotect.c
index 6ba7788497f01d5b7893a493ab446fc60f9f3eb7..529abd1f14451aff62cfd91c3b1bc26ea25b2fea 100644 (file)
--- a/tests/pkey_mprotect.c
+++ b/tests/pkey_mprotect.c
@@ -28,15 +28,14 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
-#if defined __NR_pkey_mprotect
+#ifdef __NR_pkey_mprotect
 
 # include <stdio.h>
 # include <unistd.h>
-
-#include <sys/mman.h>
+# include <sys/mman.h>
 
 const char *
 sprintptr(kernel_ulong_t ptr)

diff --git a/tests/preadv2-pwritev2.c b/tests/preadv2-pwritev2.c
index 97deb4f95c3f3c35793a79d60ec6b3081c4512fd..f7c46c0af301a03c5d13ccc1c01c8c99b97479f3 100644 (file)
--- a/tests/preadv2-pwritev2.c
+++ b/tests/preadv2-pwritev2.c
@@ -29,6 +29,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #if defined __NR_preadv2 && defined __NR_pwritev2
 

diff --git a/tests/userfaultfd.c b/tests/userfaultfd.c
index 254b84e952da290d66c4da425b5a4e319367a353..60432fa38d48a94635c8cfdbe54f4eb423e4a02a 100644 (file)
--- a/tests/userfaultfd.c
+++ b/tests/userfaultfd.c
@@ -28,6 +28,7 @@
 #include "tests.h"
 #include <fcntl.h>
 #include <asm/unistd.h>
+#include "scno.h"
 
 #if defined __NR_userfaultfd && defined O_CLOEXEC