mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
asm-generic: siginfo: remove obsolete #ifdefs
The frv, tile and blackfin architectures are being removed, so we can clean up this header by removing all the special cases except those for ia64. The SEGV_BNDERR and BUS_MCEERR_AR si_code macros are now defined unconditionally on all remaining architectures. Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
a687a53370
commit
3f664931b3
1 changed files with 2 additions and 34 deletions
|
@ -179,28 +179,13 @@ typedef struct siginfo {
|
|||
* SIGILL si_codes
|
||||
*/
|
||||
#define ILL_ILLOPC 1 /* illegal opcode */
|
||||
#ifdef __bfin__
|
||||
# define ILL_ILLPARAOP 2 /* illegal opcode combine */
|
||||
#endif
|
||||
#define ILL_ILLOPN 2 /* illegal operand */
|
||||
#define ILL_ILLADR 3 /* illegal addressing mode */
|
||||
#define ILL_ILLTRP 4 /* illegal trap */
|
||||
#ifdef __bfin__
|
||||
# define ILL_ILLEXCPT 4 /* unrecoverable exception */
|
||||
#endif
|
||||
#define ILL_PRVOPC 5 /* privileged opcode */
|
||||
#define ILL_PRVREG 6 /* privileged register */
|
||||
#define ILL_COPROC 7 /* coprocessor error */
|
||||
#define ILL_BADSTK 8 /* internal stack error */
|
||||
#ifdef __bfin__
|
||||
# define ILL_CPLB_VI 9 /* D/I CPLB protect violation */
|
||||
# define ILL_CPLB_MISS 10 /* D/I CPLB miss */
|
||||
# define ILL_CPLB_MULHIT 11 /* D/I CPLB multiple hit */
|
||||
#endif
|
||||
#ifdef __tile__
|
||||
# define ILL_DBLFLT 9 /* double fault */
|
||||
# define ILL_HARDWALL 10 /* user networks hardwall violation */
|
||||
#endif
|
||||
#ifdef __ia64__
|
||||
# define ILL_BADIADDR 9 /* unimplemented instruction address */
|
||||
# define __ILL_BREAK 10 /* illegal break */
|
||||
|
@ -219,9 +204,6 @@ typedef struct siginfo {
|
|||
#define FPE_FLTRES 6 /* floating point inexact result */
|
||||
#define FPE_FLTINV 7 /* floating point invalid operation */
|
||||
#define FPE_FLTSUB 8 /* subscript out of range */
|
||||
#ifdef __frv__
|
||||
# define FPE_MDAOVF 9 /* media overflow */
|
||||
#endif
|
||||
#ifdef __ia64__
|
||||
# define __FPE_DECOVF 9 /* decimal overflow */
|
||||
# define __FPE_DECDIV 10 /* decimal division by zero */
|
||||
|
@ -236,11 +218,7 @@ typedef struct siginfo {
|
|||
*/
|
||||
#define SEGV_MAPERR 1 /* address not mapped to object */
|
||||
#define SEGV_ACCERR 2 /* invalid permissions for mapped object */
|
||||
#ifdef __bfin__
|
||||
# define SEGV_STACKFLOW 3 /* stack overflow */
|
||||
#else
|
||||
# define SEGV_BNDERR 3 /* failed address bound checks */
|
||||
#endif
|
||||
#define SEGV_BNDERR 3 /* failed address bound checks */
|
||||
#ifdef __ia64__
|
||||
# define __SEGV_PSTKOVF 4 /* paragraph stack overflow */
|
||||
#else
|
||||
|
@ -254,12 +232,8 @@ typedef struct siginfo {
|
|||
#define BUS_ADRALN 1 /* invalid address alignment */
|
||||
#define BUS_ADRERR 2 /* non-existent physical address */
|
||||
#define BUS_OBJERR 3 /* object specific hardware error */
|
||||
#ifdef __bfin__
|
||||
# define BUS_OPFETCH 4 /* error from instruction fetch */
|
||||
#else
|
||||
/* hardware memory error consumed on a machine check: action required */
|
||||
# define BUS_MCEERR_AR 4
|
||||
#endif
|
||||
#define BUS_MCEERR_AR 4
|
||||
/* hardware memory error detected in process but not consumed: action optional*/
|
||||
#define BUS_MCEERR_AO 5
|
||||
#define NSIGBUS 5
|
||||
|
@ -271,12 +245,6 @@ typedef struct siginfo {
|
|||
#define TRAP_TRACE 2 /* process trace trap */
|
||||
#define TRAP_BRANCH 3 /* process taken branch trap */
|
||||
#define TRAP_HWBKPT 4 /* hardware breakpoint/watchpoint */
|
||||
#ifdef __bfin__
|
||||
# define TRAP_STEP 1 /* single-step breakpoint */
|
||||
# define TRAP_TRACEFLOW 2 /* trace buffer overflow */
|
||||
# define TRAP_WATCHPT 3 /* watchpoint match */
|
||||
# define TRAP_ILLTRAP 4 /* illegal trap */
|
||||
#endif
|
||||
#define NSIGTRAP 4
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue