diff options
| -rw-r--r-- | arch/ia64/include/uapi/asm/siginfo.h | 13 | ||||
| -rw-r--r-- | arch/mips/include/uapi/asm/siginfo.h | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h index bce9bc1a66c4..0151cfab929d 100644 --- a/arch/ia64/include/uapi/asm/siginfo.h +++ b/arch/ia64/include/uapi/asm/siginfo.h | |||
| @@ -63,10 +63,15 @@ typedef struct siginfo { | |||
| 63 | unsigned int _flags; /* see below */ | 63 | unsigned int _flags; /* see below */ |
| 64 | unsigned long _isr; /* isr */ | 64 | unsigned long _isr; /* isr */ |
| 65 | short _addr_lsb; /* lsb of faulting address */ | 65 | short _addr_lsb; /* lsb of faulting address */ |
| 66 | struct { | 66 | union { |
| 67 | void __user *_lower; | 67 | /* used when si_code=SEGV_BNDERR */ |
| 68 | void __user *_upper; | 68 | struct { |
| 69 | } _addr_bnd; | 69 | void __user *_lower; |
| 70 | void __user *_upper; | ||
| 71 | } _addr_bnd; | ||
| 72 | /* used when si_code=SEGV_PKUERR */ | ||
| 73 | u64 _pkey; | ||
| 74 | }; | ||
| 70 | } _sigfault; | 75 | } _sigfault; |
| 71 | 76 | ||
| 72 | /* SIGPOLL */ | 77 | /* SIGPOLL */ |
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h index 2cb7fdead570..6f4edf0d794c 100644 --- a/arch/mips/include/uapi/asm/siginfo.h +++ b/arch/mips/include/uapi/asm/siginfo.h | |||
| @@ -86,10 +86,15 @@ typedef struct siginfo { | |||
| 86 | int _trapno; /* TRAP # which caused the signal */ | 86 | int _trapno; /* TRAP # which caused the signal */ |
| 87 | #endif | 87 | #endif |
| 88 | short _addr_lsb; | 88 | short _addr_lsb; |
| 89 | struct { | 89 | union { |
| 90 | void __user *_lower; | 90 | /* used when si_code=SEGV_BNDERR */ |
| 91 | void __user *_upper; | 91 | struct { |
| 92 | } _addr_bnd; | 92 | void __user *_lower; |
| 93 | void __user *_upper; | ||
| 94 | } _addr_bnd; | ||
| 95 | /* used when si_code=SEGV_PKUERR */ | ||
| 96 | u64 _pkey; | ||
| 97 | }; | ||
| 93 | } _sigfault; | 98 | } _sigfault; |
| 94 | 99 | ||
| 95 | /* SIGPOLL, SIGXFSZ (To do ...) */ | 100 | /* SIGPOLL, SIGXFSZ (To do ...) */ |