signals, ia64, mips: Update arch-specific siginfos with pkeys field

[cascardo/linux.git] / arch / mips / include / uapi / asm / siginfo.h

diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
index 2cb7fde..6f4edf0 100644 (file)
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -86,10 +86,15 @@ typedef struct siginfo {
                        int _trapno;    /* TRAP # which caused the signal */
 #endif
                        short _addr_lsb;
-                       struct {
-                               void __user *_lower;
-                               void __user *_upper;
-                       } _addr_bnd;
+                       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 ...)  */