Commit 44eebacd authored by Muhammad Usama Anjum's avatar Muhammad Usama Anjum Committed by Shuah Khan

selftests: clone3: remove duplicate defines

Remove duplicate defines which are already included in kernel headers.
MAX_PID_NS_LEVEL macro is used inside kernel only. It isn't exposed to
userspace. So it is never defined in test application. Remove #ifndef in
this case.
Signed-off-by: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent dfc03305
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
#include "../kselftest_harness.h" #include "../kselftest_harness.h"
#include "clone3_selftests.h" #include "clone3_selftests.h"
#ifndef MAX_PID_NS_LEVEL
#define MAX_PID_NS_LEVEL 32 #define MAX_PID_NS_LEVEL 32
#endif
static void child_exit(int ret) static void child_exit(int ret)
{ {
......
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
#include "../kselftest.h" #include "../kselftest.h"
#include "clone3_selftests.h" #include "clone3_selftests.h"
#ifndef CLONE_CLEAR_SIGHAND
#define CLONE_CLEAR_SIGHAND 0x100000000ULL
#endif
static void nop_handler(int signo) static void nop_handler(int signo)
{ {
} }
......
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
#define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr))) #define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
#ifndef CLONE_INTO_CGROUP
#define CLONE_INTO_CGROUP 0x200000000ULL /* Clone into a specific cgroup given the right permissions. */
#endif
#ifndef __NR_clone3 #ifndef __NR_clone3
#define __NR_clone3 -1 #define __NR_clone3 -1
#endif #endif
...@@ -32,18 +28,9 @@ struct __clone_args { ...@@ -32,18 +28,9 @@ struct __clone_args {
__aligned_u64 stack; __aligned_u64 stack;
__aligned_u64 stack_size; __aligned_u64 stack_size;
__aligned_u64 tls; __aligned_u64 tls;
#ifndef CLONE_ARGS_SIZE_VER0
#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */
#endif
__aligned_u64 set_tid; __aligned_u64 set_tid;
__aligned_u64 set_tid_size; __aligned_u64 set_tid_size;
#ifndef CLONE_ARGS_SIZE_VER1
#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */
#endif
__aligned_u64 cgroup; __aligned_u64 cgroup;
#ifndef CLONE_ARGS_SIZE_VER2
#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */
#endif
}; };
static pid_t sys_clone3(struct __clone_args *args, size_t size) static pid_t sys_clone3(struct __clone_args *args, size_t size)
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
#include "../kselftest.h" #include "../kselftest.h"
#include "clone3_selftests.h" #include "clone3_selftests.h"
#ifndef MAX_PID_NS_LEVEL
#define MAX_PID_NS_LEVEL 32 #define MAX_PID_NS_LEVEL 32
#endif
static int pipe_1[2]; static int pipe_1[2];
static int pipe_2[2]; static int pipe_2[2];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment