aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorQiaowei Ren <qiaowei.ren@intel.com>2014-11-14 10:18:22 -0500
committerThomas Gleixner <tglx@linutronix.de>2014-11-17 18:58:53 -0500
commit53f037b08b5bebf47aa2b574a984e2f9fc7926f2 (patch)
tree0e0475e3599793515762fb6b9b7afacdce772d44 /arch/ia64
parent232b5fff5bad78ad00b94153fa90ca53bef6a444 (diff)
ia64: Sync struct siginfo with general version
New fields about bound violation are added into general struct siginfo. This will impact MIPS and IA64, which extend general struct siginfo. This patch syncs this struct for IA64 with general version. Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: linux-mm@kvack.org Cc: linux-mips@linux-mips.org Cc: Dave Hansen <dave@sr71.net> Link: http://lkml.kernel.org/r/20141114151822.82B3B486@viggo.jf.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/uapi/asm/siginfo.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
index 4ea6225196bb..bce9bc1a66c4 100644
--- a/arch/ia64/include/uapi/asm/siginfo.h
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -63,6 +63,10 @@ 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 {
67 void __user *_lower;
68 void __user *_upper;
69 } _addr_bnd;
66 } _sigfault; 70 } _sigfault;
67 71
68 /* SIGPOLL */ 72 /* SIGPOLL */
@@ -110,9 +114,9 @@ typedef struct siginfo {
110/* 114/*
111 * SIGSEGV si_codes 115 * SIGSEGV si_codes
112 */ 116 */
113#define __SEGV_PSTKOVF (__SI_FAULT|3) /* paragraph stack overflow */ 117#define __SEGV_PSTKOVF (__SI_FAULT|4) /* paragraph stack overflow */
114#undef NSIGSEGV 118#undef NSIGSEGV
115#define NSIGSEGV 3 119#define NSIGSEGV 4
116 120
117#undef NSIGTRAP 121#undef NSIGTRAP
118#define NSIGTRAP 4 122#define NSIGTRAP 4