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

Commit 2eb50e2e authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

ia64/signal: switch to generic struct siginfo 



... at a cost of added small ifdef __ia64__ in asm-generic siginfo.h,
that is.

-- EWB Corrected the comment on _flags to reflect the move

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 2f82a46f

arch/ia64/include/uapi/asm/siginfo.h

+0 −67
Original line number Diff line number Diff line
@@ -11,77 +11,10 @@ 


#define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))



#define HAVE_ARCH_SIGINFO_T

#define HAVE_ARCH_COPY_SIGINFO_TO_USER



#include <asm-generic/siginfo.h>



typedef struct siginfo {

	int si_signo;

	int si_errno;

	int si_code;

	int __pad0;



	union {

		int _pad[SI_PAD_SIZE];



		/* kill() */

		struct {

			pid_t _pid;		/* sender's pid */

			uid_t _uid;		/* sender's uid */

		} _kill;



		/* POSIX.1b timers */

		struct {

			timer_t _tid;		/* timer id */

			int _overrun;		/* overrun count */

			char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];

			sigval_t _sigval;	/* must overlay ._rt._sigval! */

			int _sys_private;	/* not to be passed to user */

		} _timer;



		/* POSIX.1b signals */

		struct {

			pid_t _pid;		/* sender's pid */

			uid_t _uid;		/* sender's uid */

			sigval_t _sigval;

		} _rt;



		/* SIGCHLD */

		struct {

			pid_t _pid;		/* which child */

			uid_t _uid;		/* sender's uid */

			int _status;		/* exit code */

			clock_t _utime;

			clock_t _stime;

		} _sigchld;



		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */

		struct {

			void __user *_addr;	/* faulting insn/memory ref. */

			int _imm;		/* immediate value for "break" */

			unsigned int _flags;	/* see below */

			unsigned long _isr;	/* isr */

			short _addr_lsb;	/* lsb of faulting address */

			union {

				/* used when si_code=SEGV_BNDERR */

				struct {

					void __user *_lower;

					void __user *_upper;

				} _addr_bnd;

				/* used when si_code=SEGV_PKUERR */

				__u32 _pkey;

			};

		} _sigfault;



		/* SIGPOLL */

		struct {

			long _band;	/* POLL_IN, POLL_OUT, POLL_MSG (XPG requires a "long") */

			int _fd;

		} _sigpoll;

	} _sifields;

} siginfo_t;



#define si_imm		_sifields._sigfault._imm	/* as per UNIX SysV ABI spec */

#define si_flags	_sifields._sigfault._flags

/*

include/uapi/asm-generic/siginfo.h

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ typedef struct siginfo { 
			void __user *_addr; /* faulting insn/memory ref. */

#ifdef __ARCH_SI_TRAPNO

			int _trapno;	/* TRAP # which caused the signal */

#endif

#ifdef __ia64__

			int _imm;		/* immediate value for "break" */

			unsigned int _flags;	/* see ia64 si_flags */

			unsigned long _isr;	/* isr */

#endif

			short _addr_lsb; /* LSB of the reported address */

			union {