<div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-size:small"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Nov 29, 2022 at 1:40 PM Yang Xu <<a href="mailto:xuyang2018.jy@fujitsu.com">xuyang2018.jy@fujitsu.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Kernel header doesn't have this namespaces_constants.h header file and<br>
it can be moved into lapi/sched. Also, lapi/clone.h have some duplicated<br>
CLONE_* constants, they should be moved into here too.<br>
<br>
Signed-off-by: Yang Xu <<a href="mailto:xuyang2018.jy@fujitsu.com" target="_blank">xuyang2018.jy@fujitsu.com</a>><br></blockquote><div><br></div><div class="gmail_default" style="font-size:small">Reviewed-by: Li Wang <<a href="mailto:liwang@redhat.com">liwang@redhat.com</a>></div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small"></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
 include/lapi/namespaces_constants.h           | 34 ---------------<br>
 include/lapi/sched.h                          | 41 +++++++++++++++++--<br>
 lib/tst_net.c                                 |  2 +-<br>
 testcases/cve/cve-2017-16939.c                |  2 +-<br>
 testcases/cve/icmp_rate_limit01.c             |  2 +-<br>
 .../kernel/containers/libclone/libclone.h     |  3 +-<br>
 testcases/kernel/containers/mountns/mountns.h |  2 +-<br>
 .../kernel/containers/netns/netns_netlink.c   |  3 +-<br>
 testcases/kernel/containers/pidns/pidns01.c   |  2 +-<br>
 testcases/kernel/containers/pidns/pidns02.c   |  2 +-<br>
 testcases/kernel/containers/pidns/pidns03.c   |  2 +-<br>
 testcases/kernel/containers/pidns/pidns12.c   |  2 +-<br>
 testcases/kernel/containers/pidns/pidns20.c   |  2 +-<br>
 testcases/kernel/containers/pidns/pidns32.c   |  2 +-<br>
 testcases/kernel/containers/share/ns_common.h |  2 +-<br>
 testcases/kernel/containers/share/ns_create.c |  3 +-<br>
 testcases/kernel/containers/share/ns_exec.c   |  3 +-<br>
 testcases/kernel/containers/sysvipc/common.h  |  2 +-<br>
 testcases/kernel/containers/timens/timens01.c |  2 +-<br>
 testcases/kernel/containers/userns/common.h   |  2 +-<br>
 .../kernel/controllers/cgroup/cgroup_core02.c |  3 +-<br>
 .../syscalls/clock_gettime/clock_gettime03.c  |  2 +-<br>
 .../clock_nanosleep/clock_nanosleep03.c       |  2 +-<br>
 testcases/kernel/syscalls/clone/clone09.c     |  3 +-<br>
 .../kernel/syscalls/fanotify/fanotify17.c     |  3 +-<br>
 .../kernel/syscalls/getxattr/getxattr05.c     |  3 +-<br>
 testcases/kernel/syscalls/ioctl/ioctl_ns01.c  |  3 +-<br>
 testcases/kernel/syscalls/ioctl/ioctl_ns05.c  |  3 +-<br>
 testcases/kernel/syscalls/ioctl/ioctl_ns06.c  |  3 +-<br>
 testcases/kernel/syscalls/setns/setns.h       |  2 +-<br>
 testcases/kernel/syscalls/sysinfo/sysinfo03.c |  2 +-<br>
 testcases/kernel/syscalls/timerfd/timerfd04.c |  2 +-<br>
 32 files changed, 67 insertions(+), 79 deletions(-)<br>
 delete mode 100644 include/lapi/namespaces_constants.h<br>
<br>
diff --git a/include/lapi/namespaces_constants.h b/include/lapi/namespaces_constants.h<br>
deleted file mode 100644<br>
index e34b0d6a8..000000000<br>
--- a/include/lapi/namespaces_constants.h<br>
+++ /dev/null<br>
@@ -1,34 +0,0 @@<br>
-// SPDX-License-Identifier: GPL-2.0-or-later<br>
-/*<br>
- * Copyright (c) 2015 Red Hat, Inc.<br>
- */<br>
-<br>
-#ifndef LAPI_NAMESPACES_CONSTANTS_H__<br>
-#define LAPI_NAMESPACES_CONSTANTS_H__<br>
-<br>
-#ifndef CLONE_NEWIPC<br>
-#  define CLONE_NEWIPC 0x08000000<br>
-#endif<br>
-#ifndef CLONE_NEWNS<br>
-#  define CLONE_NEWNS  0x00020000<br>
-#endif<br>
-#ifndef CLONE_NEWNET<br>
-#  define CLONE_NEWNET 0x40000000<br>
-#endif<br>
-#ifndef CLONE_NEWPID<br>
-#  define CLONE_NEWPID 0x20000000<br>
-#endif<br>
-#ifndef CLONE_NEWUSER<br>
-#  define CLONE_NEWUSER        0x10000000<br>
-#endif<br>
-#ifndef CLONE_NEWCGROUP<br>
-#  define CLONE_NEWCGROUP 0x02000000<br>
-#endif<br>
-#ifndef CLONE_NEWUTS<br>
-#  define CLONE_NEWUTS 0x04000000<br>
-#endif<br>
-#ifndef CLONE_NEWTIME<br>
-#  define CLONE_NEWTIME 0x00000080<br>
-#endif<br>
-<br>
-#endif /* LAPI_NAMESPACES_CONSTANTS_H__ */<br>
diff --git a/include/lapi/sched.h b/include/lapi/sched.h<br>
index 226d3109a..3b0b4be31 100644<br>
--- a/include/lapi/sched.h<br>
+++ b/include/lapi/sched.h<br>
@@ -8,6 +8,7 @@<br>
 #define LAPI_SCHED_H__<br>
<br>
 #include <sched.h><br>
+#include <unistd.h><br>
 #include <stdint.h><br>
 #include <inttypes.h><br>
 #include "lapi/syscalls.h"<br>
@@ -47,19 +48,51 @@ static inline int sched_getattr(pid_t pid, struct sched_attr *attr,<br>
 #endif<br>
<br>
 #ifndef CLONE_VM<br>
-# define CLONE_VM   0x00000100<br>
+# define CLONE_VM      0x00000100<br>
 #endif<br>
<br>
 #ifndef CLONE_FS<br>
-# define CLONE_FS   0x00000200<br>
+# define CLONE_FS      0x00000200<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWNS<br>
+# define CLONE_NEWNS   0x00020000<br>
 #endif<br>
<br>
 #ifndef CLONE_SYSVSEM<br>
-# define CLONE_SYSVSEM   0x00040000<br>
+# define CLONE_SYSVSEM 0x00040000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWCGROUP<br>
+# define CLONE_NEWCGROUP       0x02000000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWUTS<br>
+# define CLONE_NEWUTS          0x04000000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWIPC<br>
+#  define CLONE_NEWIPC         0x08000000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWUSER<br>
+#  define CLONE_NEWUSER                0x10000000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWPID<br>
+#  define CLONE_NEWPID         0x20000000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWNET<br>
+# define CLONE_NEWNET          0x40000000<br>
 #endif<br>
<br>
 #ifndef CLONE_IO<br>
-# define CLONE_IO        0x80000000<br>
+# define CLONE_IO              0x80000000<br>
+#endif<br>
+<br>
+#ifndef CLONE_NEWTIME<br>
+# define CLONE_NEWTIME         0x00000080<br>
 #endif<br>
<br>
 #endif /* LAPI_SCHED_H__ */<br>
diff --git a/lib/tst_net.c b/lib/tst_net.c<br>
index 61fc0ea76..a97e25b11 100644<br>
--- a/lib/tst_net.c<br>
+++ b/lib/tst_net.c<br>
@@ -14,7 +14,7 @@<br>
 #include "tst_test.h"<br>
 #include "tst_net.h"<br>
 #include "tst_private.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 void tst_print_svar(const char *name, const char *val)<br>
 {<br>
diff --git a/testcases/cve/cve-2017-16939.c b/testcases/cve/cve-2017-16939.c<br>
index eb5400c0c..e41fb274a 100644<br>
--- a/testcases/cve/cve-2017-16939.c<br>
+++ b/testcases/cve/cve-2017-16939.c<br>
@@ -25,7 +25,7 @@<br>
 #include "tst_res_flags.h"<br>
 #include "tst_safe_macros.h"<br>
 #include "tst_safe_net.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define BUFSIZE 2048<br>
<br>
diff --git a/testcases/cve/icmp_rate_limit01.c b/testcases/cve/icmp_rate_limit01.c<br>
index 7a51aa0a4..8ee50a276 100644<br>
--- a/testcases/cve/icmp_rate_limit01.c<br>
+++ b/testcases/cve/icmp_rate_limit01.c<br>
@@ -34,7 +34,7 @@<br>
 #include "lapi/if_addr.h"<br>
 #include "tst_test.h"<br>
 #include "tst_netdevice.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define DSTNET 0xfa444e00 /* 250.68.78.0 */<br>
 #define SRCNET 0xfa444e40 /* 250.68.78.64 */<br>
diff --git a/testcases/kernel/containers/libclone/libclone.h b/testcases/kernel/containers/libclone/libclone.h<br>
index b8740f1bc..e92fdca02 100644<br>
--- a/testcases/kernel/containers/libclone/libclone.h<br>
+++ b/testcases/kernel/containers/libclone/libclone.h<br>
@@ -19,7 +19,6 @@<br>
<br>
 #include <stdio.h><br>
 #include <stdlib.h><br>
-#include <sched.h><br>
 #include <unistd.h><br>
 #include <string.h><br>
 #include <errno.h><br>
@@ -28,7 +27,7 @@<br>
 #include <signal.h><br>
 #include "lapi/syscalls.h"<br>
 #include "test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define T_UNSHARE 0<br>
 #define T_CLONE 1<br>
diff --git a/testcases/kernel/containers/mountns/mountns.h b/testcases/kernel/containers/mountns/mountns.h<br>
index 76b37b477..615f1a058 100644<br>
--- a/testcases/kernel/containers/mountns/mountns.h<br>
+++ b/testcases/kernel/containers/mountns/mountns.h<br>
@@ -8,7 +8,7 @@<br>
 #define COMMON_H<br>
<br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define DIRA "LTP_DIR_A"<br>
 #define DIRB "LTP_DIR_B"<br>
diff --git a/testcases/kernel/containers/netns/netns_netlink.c b/testcases/kernel/containers/netns/netns_netlink.c<br>
index 6f60ff94e..e8df616e2 100644<br>
--- a/testcases/kernel/containers/netns/netns_netlink.c<br>
+++ b/testcases/kernel/containers/netns/netns_netlink.c<br>
@@ -33,11 +33,10 @@<br>
 #include <stdio.h><br>
 #include <stdlib.h><br>
 #include <errno.h><br>
-#include <sched.h><br>
<br>
 #include "tst_test.h"<br>
 #include "tst_safe_macros.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define MAX_TRIES 1000<br>
<br>
diff --git a/testcases/kernel/containers/pidns/pidns01.c b/testcases/kernel/containers/pidns/pidns01.c<br>
index eba4b806b..5080b6fad 100644<br>
--- a/testcases/kernel/containers/pidns/pidns01.c<br>
+++ b/testcases/kernel/containers/pidns/pidns01.c<br>
@@ -15,7 +15,7 @@<br>
  */<br>
<br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static int child_func(LTP_ATTRIBUTE_UNUSED void *arg)<br>
 {<br>
diff --git a/testcases/kernel/containers/pidns/pidns02.c b/testcases/kernel/containers/pidns/pidns02.c<br>
index 9f3a46526..b8913d3f6 100644<br>
--- a/testcases/kernel/containers/pidns/pidns02.c<br>
+++ b/testcases/kernel/containers/pidns/pidns02.c<br>
@@ -14,7 +14,7 @@<br>
  */<br>
<br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static int child_func(LTP_ATTRIBUTE_UNUSED void *arg)<br>
 {<br>
diff --git a/testcases/kernel/containers/pidns/pidns03.c b/testcases/kernel/containers/pidns/pidns03.c<br>
index b9b38b5d9..122ba7891 100644<br>
--- a/testcases/kernel/containers/pidns/pidns03.c<br>
+++ b/testcases/kernel/containers/pidns/pidns03.c<br>
@@ -13,7 +13,7 @@<br>
<br>
 #include <sys/mount.h><br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define PROCDIR "proc"<br>
<br>
diff --git a/testcases/kernel/containers/pidns/pidns12.c b/testcases/kernel/containers/pidns/pidns12.c<br>
index 0e6b17142..fb1ec90ca 100644<br>
--- a/testcases/kernel/containers/pidns/pidns12.c<br>
+++ b/testcases/kernel/containers/pidns/pidns12.c<br>
@@ -16,7 +16,7 @@<br>
 #define _GNU_SOURCE 1<br>
 #include <signal.h><br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static volatile pid_t sig_pid = -1;<br>
<br>
diff --git a/testcases/kernel/containers/pidns/pidns20.c b/testcases/kernel/containers/pidns/pidns20.c<br>
index f1e239dde..9f369699a 100644<br>
--- a/testcases/kernel/containers/pidns/pidns20.c<br>
+++ b/testcases/kernel/containers/pidns/pidns20.c<br>
@@ -15,7 +15,7 @@<br>
 #define _GNU_SOURCE 1<br>
 #include <signal.h><br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static volatile int signals;<br>
 static volatile int last_signo;<br>
diff --git a/testcases/kernel/containers/pidns/pidns32.c b/testcases/kernel/containers/pidns/pidns32.c<br>
index 333e1fcad..3f7df788e 100644<br>
--- a/testcases/kernel/containers/pidns/pidns32.c<br>
+++ b/testcases/kernel/containers/pidns/pidns32.c<br>
@@ -15,7 +15,7 @@<br>
<br>
 #include <sys/mman.h><br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define MAXNEST 32<br>
<br>
diff --git a/testcases/kernel/containers/share/ns_common.h b/testcases/kernel/containers/share/ns_common.h<br>
index 69e51ce71..0f85aceb4 100644<br>
--- a/testcases/kernel/containers/share/ns_common.h<br>
+++ b/testcases/kernel/containers/share/ns_common.h<br>
@@ -17,7 +17,7 @@<br>
 #ifndef __NS_COMMON_H__<br>
 #define __NS_COMMON_H__<br>
 #include <sched.h><br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define PROC_PATH "/proc"<br>
 #define NS_TOTAL 6<br>
diff --git a/testcases/kernel/containers/share/ns_create.c b/testcases/kernel/containers/share/ns_create.c<br>
index d4259f38b..3f09e71e0 100644<br>
--- a/testcases/kernel/containers/share/ns_create.c<br>
+++ b/testcases/kernel/containers/share/ns_create.c<br>
@@ -24,7 +24,6 @@<br>
  */<br>
<br>
 #define _GNU_SOURCE<br>
-#include <sched.h><br>
 #include <sys/syscall.h><br>
 #include <sys/types.h><br>
 #include <sys/stat.h><br>
@@ -32,7 +31,7 @@<br>
 #include <string.h><br>
 #include <errno.h><br>
 #include "test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
 #include "ns_common.h"<br>
<br>
 char *TCID = "ns_create";<br>
diff --git a/testcases/kernel/containers/share/ns_exec.c b/testcases/kernel/containers/share/ns_exec.c<br>
index c492165f0..4abd1063b 100644<br>
--- a/testcases/kernel/containers/share/ns_exec.c<br>
+++ b/testcases/kernel/containers/share/ns_exec.c<br>
@@ -21,7 +21,6 @@<br>
  */<br>
<br>
 #define _GNU_SOURCE<br>
-#include <sched.h><br>
 #include <sys/syscall.h><br>
 #include <sys/types.h><br>
 #include <sys/wait.h><br>
@@ -31,7 +30,7 @@<br>
 #include <errno.h><br>
 #include "test.h"<br>
 #include "lapi/syscalls.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
 #include "ns_common.h"<br>
<br>
 char *TCID = "ns_exec";<br>
diff --git a/testcases/kernel/containers/sysvipc/common.h b/testcases/kernel/containers/sysvipc/common.h<br>
index 258d355d7..9b0fc16e9 100644<br>
--- a/testcases/kernel/containers/sysvipc/common.h<br>
+++ b/testcases/kernel/containers/sysvipc/common.h<br>
@@ -11,7 +11,7 @@<br>
 #include <stdlib.h><br>
 #include "tst_test.h"<br>
 #include "lapi/syscalls.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 enum {<br>
        T_CLONE,<br>
diff --git a/testcases/kernel/containers/timens/timens01.c b/testcases/kernel/containers/timens/timens01.c<br>
index 3f6235ec3..3621b3446 100644<br>
--- a/testcases/kernel/containers/timens/timens01.c<br>
+++ b/testcases/kernel/containers/timens/timens01.c<br>
@@ -15,9 +15,9 @@<br>
  */<br>
<br>
 #define _GNU_SOURCE<br>
-#include "lapi/namespaces_constants.h"<br>
 #include "lapi/posix_clocks.h"<br>
 #include "tst_test.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static struct tcase {<br>
        const char *desc;<br>
diff --git a/testcases/kernel/containers/userns/common.h b/testcases/kernel/containers/userns/common.h<br>
index d3bdcc53f..635d0f190 100644<br>
--- a/testcases/kernel/containers/userns/common.h<br>
+++ b/testcases/kernel/containers/userns/common.h<br>
@@ -8,7 +8,7 @@<br>
 #define COMMON_H<br>
<br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define UID_MAP 0<br>
 #define GID_MAP 1<br>
diff --git a/testcases/kernel/controllers/cgroup/cgroup_core02.c b/testcases/kernel/controllers/cgroup/cgroup_core02.c<br>
index e6d599b36..1872a7dff 100644<br>
--- a/testcases/kernel/controllers/cgroup/cgroup_core02.c<br>
+++ b/testcases/kernel/controllers/cgroup/cgroup_core02.c<br>
@@ -24,14 +24,13 @@<br>
  */<br>
<br>
 #define _GNU_SOURCE<br>
-#include <sched.h><br>
 #include <stdlib.h><br>
 #include <stdio.h><br>
 #include <sys/types.h><br>
 #include <pwd.h><br>
 #include "tst_test.h"<br>
 #include "tst_safe_file_at.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static struct tst_cg_group *cg_child_a, *cg_child_b;<br>
 static uid_t nobody_uid;<br>
diff --git a/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c b/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c<br>
index f185977d3..b02d22a14 100644<br>
--- a/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c<br>
+++ b/testcases/kernel/syscalls/clock_gettime/clock_gettime03.c<br>
@@ -18,7 +18,7 @@<br>
 #include "time64_variants.h"<br>
 #include "tst_safe_clocks.h"<br>
 #include "tst_timer.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static struct tcase {<br>
        int clk_id;<br>
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c<br>
index 5bd91fa61..dfc522278 100644<br>
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c<br>
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c<br>
@@ -18,7 +18,7 @@<br>
 #include "time64_variants.h"<br>
 #include "tst_safe_clocks.h"<br>
 #include "tst_timer.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define OFFSET_S 10<br>
 #define SLEEP_US 100000<br>
diff --git a/testcases/kernel/syscalls/clone/clone09.c b/testcases/kernel/syscalls/clone/clone09.c<br>
index e9e584564..e4691f513 100644<br>
--- a/testcases/kernel/syscalls/clone/clone09.c<br>
+++ b/testcases/kernel/syscalls/clone/clone09.c<br>
@@ -4,14 +4,13 @@<br>
  */<br>
<br>
 #define _GNU_SOURCE<br>
-#include <sched.h><br>
 #include <stdlib.h><br>
 #include <errno.h><br>
<br>
 #include "tst_test.h"<br>
 #include "clone_platform.h"<br>
 #include "lapi/syscalls.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static void *child_stack;<br>
 static int sysctl_net = -1;<br>
diff --git a/testcases/kernel/syscalls/fanotify/fanotify17.c b/testcases/kernel/syscalls/fanotify/fanotify17.c<br>
index 7d74b2540..3ecb31b6e 100644<br>
--- a/testcases/kernel/syscalls/fanotify/fanotify17.c<br>
+++ b/testcases/kernel/syscalls/fanotify/fanotify17.c<br>
@@ -20,11 +20,10 @@<br>
 #include <errno.h><br>
 #include <unistd.h><br>
 #include <sys/types.h><br>
-#include <sched.h><br>
 #include <stdlib.h><br>
<br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #ifdef HAVE_SYS_FANOTIFY_H<br>
 #include "fanotify.h"<br>
diff --git a/testcases/kernel/syscalls/getxattr/getxattr05.c b/testcases/kernel/syscalls/getxattr/getxattr05.c<br>
index 3e73cc567..28eb4cbcf 100644<br>
--- a/testcases/kernel/syscalls/getxattr/getxattr05.c<br>
+++ b/testcases/kernel/syscalls/getxattr/getxattr05.c<br>
@@ -20,7 +20,6 @@<br>
 #include <errno.h><br>
 #include <unistd.h><br>
 #include <sys/types.h><br>
-#include <sched.h><br>
 #include <stdlib.h><br>
<br>
 #ifdef HAVE_SYS_XATTR_H<br>
@@ -32,7 +31,7 @@<br>
 #endif<br>
<br>
 #include "tst_test.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LIBACL)<br>
<br>
diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns01.c b/testcases/kernel/syscalls/ioctl/ioctl_ns01.c<br>
index 95be877dc..06c81ba1b 100644<br>
--- a/testcases/kernel/syscalls/ioctl/ioctl_ns01.c<br>
+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns01.c<br>
@@ -19,11 +19,10 @@<br>
 #define _GNU_SOURCE<br>
<br>
 #include <errno.h><br>
-#include <sched.h><br>
 #include <stdlib.h><br>
 #include "tst_test.h"<br>
 #include "lapi/ioctl_ns.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define STACK_SIZE (1024 * 1024)<br>
<br>
diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c<br>
index ae2f9da51..36e41c468 100644<br>
--- a/testcases/kernel/syscalls/ioctl/ioctl_ns05.c<br>
+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns05.c<br>
@@ -18,11 +18,10 @@<br>
<br>
 #include <errno.h><br>
 #include <stdio.h><br>
-#include <sched.h><br>
 #include <stdlib.h><br>
 #include "tst_test.h"<br>
 #include "lapi/ioctl_ns.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define STACK_SIZE (1024 * 1024)<br>
<br>
diff --git a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c<br>
index 393ba1437..45fc01ce7 100644<br>
--- a/testcases/kernel/syscalls/ioctl/ioctl_ns06.c<br>
+++ b/testcases/kernel/syscalls/ioctl/ioctl_ns06.c<br>
@@ -19,11 +19,10 @@<br>
<br>
 #include <errno.h><br>
 #include <stdio.h><br>
-#include <sched.h><br>
 #include <stdlib.h><br>
 #include "tst_test.h"<br>
 #include "lapi/ioctl_ns.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define STACK_SIZE (1024 * 1024)<br>
<br>
diff --git a/testcases/kernel/syscalls/setns/setns.h b/testcases/kernel/syscalls/setns/setns.h<br>
index 46beef17f..45c759917 100644<br>
--- a/testcases/kernel/syscalls/setns/setns.h<br>
+++ b/testcases/kernel/syscalls/setns/setns.h<br>
@@ -4,7 +4,7 @@<br>
  */<br>
<br>
 #include <stdio.h><br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define NS_MAX 5<br>
 static int ns_types[NS_MAX];<br>
diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c<br>
index af7cb6421..6b8f0aef7 100644<br>
--- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c<br>
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c<br>
@@ -14,9 +14,9 @@<br>
  */<br>
<br>
 #include <sys/sysinfo.h><br>
-#include "lapi/namespaces_constants.h"<br>
 #include "lapi/posix_clocks.h"<br>
 #include "tst_test.h"<br>
+#include "lapi/sched.h"<br>
<br>
 static int offsets[] = {<br>
        10,<br>
diff --git a/testcases/kernel/syscalls/timerfd/timerfd04.c b/testcases/kernel/syscalls/timerfd/timerfd04.c<br>
index eb7f98d5b..b24b4874e 100644<br>
--- a/testcases/kernel/syscalls/timerfd/timerfd04.c<br>
+++ b/testcases/kernel/syscalls/timerfd/timerfd04.c<br>
@@ -19,7 +19,7 @@<br>
 #include "tst_safe_clocks.h"<br>
 #include "tst_safe_timerfd.h"<br>
 #include "tst_timer.h"<br>
-#include "lapi/namespaces_constants.h"<br>
+#include "lapi/sched.h"<br>
<br>
 #define SLEEP_US 40000<br>
<br>
-- <br>
2.23.0<br>
<br>
<br>
-- <br>
Mailing list info: <a href="https://lists.linux.it/listinfo/ltp" rel="noreferrer" target="_blank">https://lists.linux.it/listinfo/ltp</a><br>
<br>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div>Regards,<br></div><div>Li Wang<br></div></div></div></div>