mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 05:40:06 +00:00
236c18e568
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.
45 lines
1.6 KiB
C
45 lines
1.6 KiB
C
/* Old SysV permission definition for Linux. Default version.
|
|
Copyright (C) 1995-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <sys/ipc.h> /* For __key_t */
|
|
|
|
#define __IPC_64 0x100
|
|
|
|
struct __old_ipc_perm
|
|
{
|
|
__key_t __key; /* Key. */
|
|
unsigned short int uid; /* Owner's user ID. */
|
|
unsigned short int gid; /* Owner's group ID. */
|
|
unsigned short int cuid; /* Creator's user ID. */
|
|
unsigned short int cgid; /* Creator's group ID. */
|
|
unsigned short int mode; /* Read/write permission. */
|
|
unsigned short int __seq; /* Sequence number. */
|
|
};
|
|
|
|
#define SEMCTL_ARG_ADDRESS(__arg) &__arg.array
|
|
|
|
#define MSGRCV_ARGS(__msgp, __msgtyp) \
|
|
((long int []){ (long int) __msgp, __msgtyp })
|
|
|
|
/* This macro is required to handle the s390 variants, which passes the
|
|
arguments in a different order than default. */
|
|
#define SEMTIMEDOP_IPC_ARGS(__nsops, __sops, __timeout) \
|
|
(__nsops), 0, (__sops), (__timeout)
|
|
|
|
#include <ipc_ops.h>
|