diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-10 03:08:13 +0200 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2018-01-12 21:34:49 +0100 |
| commit | 4795477b2365e51c2eb5b8db65385b19ab2e0bbf (patch) | |
| tree | e1e344bd4d95e9aea668692cdacb868b889ec6f2 /include/uapi/asm-generic/siginfo.h | |
| parent | signal: Remove unnecessary ifdefs now that there is only one struct siginfo (diff) | |
| download | linux-4795477b2365e51c2eb5b8db65385b19ab2e0bbf.tar.xz linux-4795477b2365e51c2eb5b8db65385b19ab2e0bbf.zip | |
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>
Diffstat (limited to 'include/uapi/asm-generic/siginfo.h')
| -rw-r--r-- | include/uapi/asm-generic/siginfo.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h index a650d252de0a..d32f62a7f95c 100644 --- a/include/uapi/asm-generic/siginfo.h +++ b/include/uapi/asm-generic/siginfo.h @@ -23,10 +23,6 @@ typedef union sigval { #define SI_PAD_SIZE ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int)) #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. * However, some architectures want to override this to "int" @@ -60,14 +56,13 @@ typedef struct siginfo { /* kill() */ struct { __kernel_pid_t _pid; /* sender's pid */ - __ARCH_SI_UID_T _uid; /* sender's uid */ + __kernel_uid32_t _uid; /* sender's uid */ } _kill; /* POSIX.1b timers */ struct { __kernel_timer_t _tid; /* timer id */ int _overrun; /* overrun count */ - char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)]; sigval_t _sigval; /* same as below */ int _sys_private; /* not to be passed to user */ } _timer; @@ -75,14 +70,14 @@ typedef struct siginfo { /* POSIX.1b signals */ struct { __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; } _rt; /* SIGCHLD */ struct { __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 */ __ARCH_SI_CLOCK_T _utime; __ARCH_SI_CLOCK_T _stime; |