Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4795477b authored by Al Viro's avatar Al Viro Committed by Eric W. Biederman
Browse files

signal: kill __ARCH_SI_UID_T 



it's always __kernel_uid32_t

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 0326e7ef

include/uapi/asm-generic/siginfo.h

+3 −8
Original line number Diff line number Diff line
@@ -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;