diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-05-15 10:23:49 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-05-20 12:25:31 -0300 |
| commit | 236c18e5683028d41c2721a8b1ec45c56c953d95 (patch) | |
| tree | 0ec43c7905a43917fa235c9858ff78da8feadfb8 /sysdeps/unix/sysv/linux/semtimedop.c | |
| parent | dfba907fedcb0e95af735a2d064761559f703ab6 (diff) | |
| download | glibc-236c18e5683028d41c2721a8b1ec45c56c953d95.tar glibc-236c18e5683028d41c2721a8b1ec45c56c953d95.tar.gz glibc-236c18e5683028d41c2721a8b1ec45c56c953d95.tar.bz2 glibc-236c18e5683028d41c2721a8b1ec45c56c953d95.zip | |
sysvipc: Consolidate semtimedop s390
This patch consolidates the s390-32 semtimedop implementation by defining
a arch-specific SEMTIMEDOP_IPC_ARGS to rearrange the arguments expected
by s390 Linux kABI. The idea is to avoid have multiples semtimedop
implementation changes for Linux v5.1 change to enable wire-up sysvipc
support.
Checked with a s390-linux-gnu and s390x-linux-gnu and checking that
resulting semtimedop objects did not change.
* sysdeps/unix/sysv/linux/ipc_priv.h (SEMTIMEDOP_IPC_ARGS): New
define.
* sysdpes/unix/sysv/linux/s390/ipc_priv.h: New file.
* sysdeps/unix/sysv/linux/s390/semtimedop.c: Remove file.
* sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Use
SEMTIMEDOP_IPC_ARGS for calls with __NR_ipc.
Diffstat (limited to 'sysdeps/unix/sysv/linux/semtimedop.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/semtimedop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c index 961c6d1f0b..1d746c4117 100644 --- a/sysdeps/unix/sysv/linux/semtimedop.c +++ b/sysdeps/unix/sysv/linux/semtimedop.c @@ -30,7 +30,7 @@ semtimedop (int semid, struct sembuf *sops, size_t nsops, #ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS return INLINE_SYSCALL_CALL (semtimedop, semid, sops, nsops, timeout); #else - return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, nsops, 0, sops, - timeout); + return INLINE_SYSCALL_CALL (ipc, IPCOP_semtimedop, semid, + SEMTIMEDOP_IPC_ARGS (nsops, sops, timeout)); #endif } |