Commit b376cd02 authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar

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: default avatarDave 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.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7b2d0dba
...@@ -63,10 +63,15 @@ typedef struct siginfo { ...@@ -63,10 +63,15 @@ typedef struct siginfo {
unsigned int _flags; /* see below */ unsigned int _flags; /* see below */
unsigned long _isr; /* isr */ unsigned long _isr; /* isr */
short _addr_lsb; /* lsb of faulting address */ short _addr_lsb; /* lsb of faulting address */
struct { union {
void __user *_lower; /* used when si_code=SEGV_BNDERR */
void __user *_upper; struct {
} _addr_bnd; void __user *_lower;
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
u64 _pkey;
};
} _sigfault; } _sigfault;
/* SIGPOLL */ /* SIGPOLL */
......
...@@ -86,10 +86,15 @@ typedef struct siginfo { ...@@ -86,10 +86,15 @@ typedef struct siginfo {
int _trapno; /* TRAP # which caused the signal */ int _trapno; /* TRAP # which caused the signal */
#endif #endif
short _addr_lsb; short _addr_lsb;
struct { union {
void __user *_lower; /* used when si_code=SEGV_BNDERR */
void __user *_upper; struct {
} _addr_bnd; void __user *_lower;
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
u64 _pkey;
};
} _sigfault; } _sigfault;
/* SIGPOLL, SIGXFSZ (To do ...) */ /* SIGPOLL, SIGXFSZ (To do ...) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment