signal: kill __ARCH_SI_UID_T

it's always __kernel_uid32_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Al Viro 2017-07-09 21:08:13 -04:00 committed by Eric W. Biederman
parent 0326e7ef05
commit 4795477b23

View file

@ -23,10 +23,6 @@ typedef union sigval {
#define SI_PAD_SIZE ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int)) #define SI_PAD_SIZE ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
#endif #endif
#ifndef __ARCH_SI_UID_T
#define __ARCH_SI_UID_T __kernel_uid32_t
#endif
/* /*
* The default "si_band" type is "long", as specified by POSIX. * The default "si_band" type is "long", as specified by POSIX.
* However, some architectures want to override this to "int" * However, some architectures want to override this to "int"
@ -60,14 +56,13 @@ typedef struct siginfo {
/* kill() */ /* kill() */
struct { struct {
__kernel_pid_t _pid; /* sender's pid */ __kernel_pid_t _pid; /* sender's pid */
__ARCH_SI_UID_T _uid; /* sender's uid */ __kernel_uid32_t _uid; /* sender's uid */
} _kill; } _kill;
/* POSIX.1b timers */ /* POSIX.1b timers */
struct { struct {
__kernel_timer_t _tid; /* timer id */ __kernel_timer_t _tid; /* timer id */
int _overrun; /* overrun count */ int _overrun; /* overrun count */
char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
sigval_t _sigval; /* same as below */ sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */ int _sys_private; /* not to be passed to user */
} _timer; } _timer;
@ -75,14 +70,14 @@ typedef struct siginfo {
/* POSIX.1b signals */ /* POSIX.1b signals */
struct { struct {
__kernel_pid_t _pid; /* sender's pid */ __kernel_pid_t _pid; /* sender's pid */
__ARCH_SI_UID_T _uid; /* sender's uid */ __kernel_uid32_t _uid; /* sender's uid */
sigval_t _sigval; sigval_t _sigval;
} _rt; } _rt;
/* SIGCHLD */ /* SIGCHLD */
struct { struct {
__kernel_pid_t _pid; /* which child */ __kernel_pid_t _pid; /* which child */
__ARCH_SI_UID_T _uid; /* sender's uid */ __kernel_uid32_t _uid; /* sender's uid */
int _status; /* exit code */ int _status; /* exit code */
__ARCH_SI_CLOCK_T _utime; __ARCH_SI_CLOCK_T _utime;
__ARCH_SI_CLOCK_T _stime; __ARCH_SI_CLOCK_T _stime;