mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
b376cd0256
ia64 and mips have separate definitions for siginfo from the generic one. Patch them to have the pkey fields. Note that this is exactly what we did for MPX as well. [ This fixes a compile error that Ingo was hitting with MIPS when the x86 pkeys patch set is applied. ] Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: Dave Hansen <dave@sr71.net> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Petr Malat <oss@malat.biz> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: linux-ia64@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20160217181703.E99B6656@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
128 lines
3.1 KiB
C
128 lines
3.1 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1998, 1999, 2001, 2003 Ralf Baechle
|
|
* Copyright (C) 2000, 2001 Silicon Graphics, Inc.
|
|
*/
|
|
#ifndef _UAPI_ASM_SIGINFO_H
|
|
#define _UAPI_ASM_SIGINFO_H
|
|
|
|
|
|
#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
|
|
#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ... */
|
|
|
|
#define HAVE_ARCH_SIGINFO_T
|
|
|
|
/*
|
|
* Careful to keep union _sifields from shifting ...
|
|
*/
|
|
#if _MIPS_SZLONG == 32
|
|
#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
|
|
#elif _MIPS_SZLONG == 64
|
|
#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
|
|
#else
|
|
#error _MIPS_SZLONG neither 32 nor 64
|
|
#endif
|
|
|
|
#define __ARCH_SIGSYS
|
|
|
|
#include <uapi/asm-generic/siginfo.h>
|
|
|
|
/* We can't use generic siginfo_t, because our si_code and si_errno are swapped */
|
|
typedef struct siginfo {
|
|
int si_signo;
|
|
int si_code;
|
|
int si_errno;
|
|
int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
|
|
|
|
union {
|
|
int _pad[SI_PAD_SIZE];
|
|
|
|
/* kill() */
|
|
struct {
|
|
pid_t _pid; /* sender's pid */
|
|
__ARCH_SI_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; /* same as below */
|
|
int _sys_private; /* not to be passed to user */
|
|
} _timer;
|
|
|
|
/* POSIX.1b signals */
|
|
struct {
|
|
pid_t _pid; /* sender's pid */
|
|
__ARCH_SI_UID_T _uid; /* sender's uid */
|
|
sigval_t _sigval;
|
|
} _rt;
|
|
|
|
/* SIGCHLD */
|
|
struct {
|
|
pid_t _pid; /* which child */
|
|
__ARCH_SI_UID_T _uid; /* sender's uid */
|
|
int _status; /* exit code */
|
|
clock_t _utime;
|
|
clock_t _stime;
|
|
} _sigchld;
|
|
|
|
/* IRIX SIGCHLD */
|
|
struct {
|
|
pid_t _pid; /* which child */
|
|
clock_t _utime;
|
|
int _status; /* exit code */
|
|
clock_t _stime;
|
|
} _irix_sigchld;
|
|
|
|
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
|
|
struct {
|
|
void __user *_addr; /* faulting insn/memory ref. */
|
|
#ifdef __ARCH_SI_TRAPNO
|
|
int _trapno; /* TRAP # which caused the signal */
|
|
#endif
|
|
short _addr_lsb;
|
|
union {
|
|
/* used when si_code=SEGV_BNDERR */
|
|
struct {
|
|
void __user *_lower;
|
|
void __user *_upper;
|
|
} _addr_bnd;
|
|
/* used when si_code=SEGV_PKUERR */
|
|
u64 _pkey;
|
|
};
|
|
} _sigfault;
|
|
|
|
/* SIGPOLL, SIGXFSZ (To do ...) */
|
|
struct {
|
|
__ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
|
|
int _fd;
|
|
} _sigpoll;
|
|
|
|
/* SIGSYS */
|
|
struct {
|
|
void __user *_call_addr; /* calling user insn */
|
|
int _syscall; /* triggering system call number */
|
|
unsigned int _arch; /* AUDIT_ARCH_* of syscall */
|
|
} _sigsys;
|
|
} _sifields;
|
|
} siginfo_t;
|
|
|
|
/*
|
|
* si_code values
|
|
* Again these have been chosen to be IRIX compatible.
|
|
*/
|
|
#undef SI_ASYNCIO
|
|
#undef SI_TIMER
|
|
#undef SI_MESGQ
|
|
#define SI_ASYNCIO -2 /* sent by AIO completion */
|
|
#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */
|
|
#define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */
|
|
|
|
#include <asm-generic/siginfo.h>
|
|
|
|
#endif /* _UAPI_ASM_SIGINFO_H */
|