diff -urpa elogind-235.3.orig/src/basic/missing_syscall.h elogind-235.3/src/basic/missing_syscall.h --- elogind-235.3.orig/src/basic/missing_syscall.h 2018-03-09 06:57:50.000000000 +0000 +++ elogind-235.3/src/basic/missing_syscall.h 2018-04-14 18:13:21.667411504 +0000 @@ -26,9 +26,11 @@ #include #if !HAVE_PIVOT_ROOT -static inline int pivot_root(const char *new_root, const char *put_old) { +static inline int missing_pivot_root(const char *new_root, const char *put_old) { return syscall(SYS_pivot_root, new_root, put_old); } + +# define pivot_root missing_pivot_root #endif #endif // 0 @@ -63,7 +65,7 @@ static inline int pivot_root(const char # endif # endif -static inline int memfd_create(const char *name, unsigned int flags) { +static inline int missing_memfd_create(const char *name, unsigned int flags) { # ifdef __NR_memfd_create return syscall(__NR_memfd_create, name, flags); # else @@ -71,6 +73,8 @@ static inline int memfd_create(const cha return -1; # endif } + +# define memfd_create missing_memfd_create #endif /* ======================================================================= */ @@ -110,7 +114,7 @@ static inline int memfd_create(const cha # endif # endif -static inline int getrandom(void *buffer, size_t count, unsigned flags) { +static inline int missing_getrandom(void *buffer, size_t count, unsigned flags) { # ifdef __NR_getrandom return syscall(__NR_getrandom, buffer, count, flags); # else @@ -118,14 +122,18 @@ static inline int getrandom(void *buffer return -1; # endif } + +# define getrandom missing_getrandom #endif /* ======================================================================= */ #if !HAVE_GETTID -static inline pid_t gettid(void) { +static inline pid_t missing_gettid(void) { return (pid_t) syscall(SYS_gettid); } + +# define gettid missing_gettid #endif /* ======================================================================= */ @@ -153,7 +161,7 @@ struct file_handle { unsigned char f_handle[0]; }; -static inline int name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) { +static inline int missing_name_to_handle_at(int fd, const char *name, struct file_handle *handle, int *mnt_id, int flags) { # ifdef __NR_name_to_handle_at return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags); # else @@ -161,6 +169,8 @@ static inline int name_to_handle_at(int return -1; # endif } + +# define name_to_handle_at missing_name_to_handle_at #endif /* ======================================================================= */ @@ -178,7 +188,7 @@ static inline int name_to_handle_at(int # endif # endif -static inline int setns(int fd, int nstype) { +static inline int missing_setns(int fd, int nstype) { # ifdef __NR_setns return syscall(__NR_setns, fd, nstype); # else @@ -186,6 +196,8 @@ static inline int setns(int fd, int nsty return -1; # endif } + +# define setns missing_setns #endif /* ======================================================================= */ @@ -231,7 +243,7 @@ static inline pid_t raw_getpid(void) { # endif # endif -static inline int renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) { +static inline int missing_renameat2(int oldfd, const char *oldname, int newfd, const char *newname, unsigned flags) { # ifdef __NR_renameat2 return syscall(__NR_renameat2, oldfd, oldname, newfd, newname, flags); # else @@ -239,12 +251,14 @@ static inline int renameat2(int oldfd, c return -1; # endif } + +# define renameat2 missing_renameat2 #endif /* ======================================================================= */ #if !HAVE_KCMP -static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { +static inline int missing_kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2) { # ifdef __NR_kcmp return syscall(__NR_kcmp, pid1, pid2, type, idx1, idx2); # else @@ -252,36 +266,45 @@ static inline int kcmp(pid_t pid1, pid_t return -1; # endif } + +# define kcmp missing_kcmp #endif + /* ======================================================================= */ #if !HAVE_KEYCTL -static inline long keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4,unsigned long arg5) { +static inline long missing_keyctl(int cmd, unsigned long arg2, unsigned long arg3, unsigned long arg4,unsigned long arg5) { # ifdef __NR_keyctl return syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); # else errno = ENOSYS; return -1; # endif + +# define keyctl missing_keyctl } -static inline key_serial_t add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { +static inline key_serial_t missing_add_key(const char *type, const char *description, const void *payload, size_t plen, key_serial_t ringid) { # ifdef __NR_add_key return syscall(__NR_add_key, type, description, payload, plen, ringid); # else errno = ENOSYS; return -1; # endif + +# define add_key missing_add_key } -static inline key_serial_t request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { +static inline key_serial_t missing_request_key(const char *type, const char *description, const char * callout_info, key_serial_t destringid) { # ifdef __NR_request_key return syscall(__NR_request_key, type, description, callout_info, destringid); # else errno = ENOSYS; return -1; # endif + +# define request_key missing_request_key } #endif @@ -308,10 +331,10 @@ static inline key_serial_t request_key(c # endif # endif -static inline ssize_t copy_file_range(int fd_in, loff_t *off_in, - int fd_out, loff_t *off_out, - size_t len, - unsigned int flags) { +static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in, + int fd_out, loff_t *off_out, + size_t len, + unsigned int flags) { # ifdef __NR_copy_file_range return syscall(__NR_copy_file_range, fd_in, off_in, fd_out, off_out, len, flags); # else @@ -319,6 +342,8 @@ static inline ssize_t copy_file_range(in return -1; # endif } + +# define copy_file_range missing_copy_file_range #endif #if !HAVE_BPF @@ -340,7 +365,7 @@ static inline ssize_t copy_file_range(in union bpf_attr; -static inline int bpf(int cmd, union bpf_attr *attr, size_t size) { +static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) { #ifdef __NR_bpf return (int) syscall(__NR_bpf, cmd, attr, size); #else @@ -349,4 +374,5 @@ static inline int bpf(int cmd, union bpf #endif } +# define bpf missing_bpf #endif