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

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>

diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
index bce9bc1..0151cfa 100644 (file)
--- a/arch/ia64/include/uapi/asm/siginfo.h
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -63,10 +63,15 @@ typedef struct siginfo {
                        unsigned int _flags;    /* see below */
                        unsigned long _isr;     /* isr */
                        short _addr_lsb;        /* lsb of faulting address */
-                       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 */

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 ...)  */