diff options
| author | Michael Biebl <biebl@debian.org> | 2020-10-20 22:08:23 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-10-20 22:08:23 +0200 |
| commit | 769cfe6fb306e976faea4070948c07f4e61bf849 (patch) | |
| tree | 0c2235a59a607a2443c195c741c60c9a59598e51 /shared/systemd | |
| parent | b4dab9a9dd24d8d70e1bb288078570e85ad43b96 (diff) | |
| parent | f2ddac4cbc895837ddcc55015fae112f9859cd0a (diff) | |
Update upstream source from tag 'upstream/1.27.91'
Update to upstream version '1.27.91' with Debian dir 00b16bc3e33f8058a60e79863d76fe240a94309d
Diffstat (limited to 'shared/systemd')
| -rw-r--r-- | shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 4 | ||||
| -rw-r--r-- | shared/systemd/src/basic/missing_syscall.h | 28 | ||||
| -rw-r--r-- | shared/systemd/src/basic/socket-util.c | 2 |
3 files changed, 32 insertions, 2 deletions
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index a937a889..0160284d 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -140,6 +140,10 @@ NM_PRAGMA_WARNING_DISABLE("-Wdeclaration-after-statement") /*****************************************************************************/ +struct statx; + +/*****************************************************************************/ + static inline pid_t raw_getpid(void) { diff --git a/shared/systemd/src/basic/missing_syscall.h b/shared/systemd/src/basic/missing_syscall.h index 4aed6e7c..d11a77d5 100644 --- a/shared/systemd/src/basic/missing_syscall.h +++ b/shared/systemd/src/basic/missing_syscall.h @@ -632,8 +632,20 @@ static inline long missing_get_mempolicy(int *mode, unsigned long *nodemask, /* ======================================================================= */ /* should be always defined, see kernel 39036cd2727395c3369b1051005da74059a85317 */ -#if defined(__alpha__) +#if defined __alpha__ # define systemd_NR_pidfd_send_signal 534 +#elif defined _MIPS_SIM +# if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */ +# define systemd_NR_pidfd_send_signal (424 + 4000) +# endif +# if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */ +# define systemd_NR_pidfd_send_signal (424 + 6000) +# endif +# if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */ +# define systemd_NR_pidfd_send_signal (424 + 5000) +# endif +#elif defined __ia64__ +# define systemd_NR_pidfd_send_signal (424 + 1024) #else # define systemd_NR_pidfd_send_signal 424 #endif @@ -664,8 +676,20 @@ static inline int missing_pidfd_send_signal(int fd, int sig, siginfo_t *info, un #endif /* should be always defined, see kernel 7615d9e1780e26e0178c93c55b73309a5dc093d7 */ -#if defined(__alpha__) +#if defined __alpha__ # define systemd_NR_pidfd_open 544 +#elif defined _MIPS_SIM +# if _MIPS_SIM == _MIPS_SIM_ABI32 /* o32 */ +# define systemd_NR_pidfd_open (434 + 4000) +# endif +# if _MIPS_SIM == _MIPS_SIM_NABI32 /* n32 */ +# define systemd_NR_pidfd_open (434 + 6000) +# endif +# if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */ +# define systemd_NR_pidfd_open (434 + 5000) +# endif +#elif defined __ia64__ +# define systemd_NR_pidfd_open (434 + 1024) #else # define systemd_NR_pidfd_open 434 #endif diff --git a/shared/systemd/src/basic/socket-util.c b/shared/systemd/src/basic/socket-util.c index 01dce3ab..4d889e56 100644 --- a/shared/systemd/src/basic/socket-util.c +++ b/shared/systemd/src/basic/socket-util.c @@ -1217,6 +1217,7 @@ ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags) { return n; } +#if 0 /* NM_IGNORED */ int socket_get_family(int fd, int *ret) { int af; socklen_t sl = sizeof(af); @@ -1393,3 +1394,4 @@ int socket_set_transparent(int fd, int af, bool b) { return -EAFNOSUPPORT; } } +#endif /* NM_IGNORED */ |