diff options
| author | Andi Kleen <ak@linux.intel.com> | 2010-10-22 11:40:07 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-10-22 11:40:07 -0400 |
| commit | df27570f43923c246567b074418411c06cf0dce2 (patch) | |
| tree | 1390735b5232b579f6eb0bb9bb25df019d4ce795 /arch/ia64 | |
| parent | d4429f608abde89e8bc1e24b43cd503feb95c496 (diff) | |
| parent | f7cb8b5ffd16edad64ae16ee38c561f98cbcaa3b (diff) | |
Merge branch 'hwpoison-fixes-2.6.37' into hwpoison
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/siginfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/siginfo.h b/arch/ia64/include/asm/siginfo.h index 118d42979003..c8fcaa2ac48f 100644 --- a/arch/ia64/include/asm/siginfo.h +++ b/arch/ia64/include/asm/siginfo.h | |||
| @@ -62,6 +62,7 @@ typedef struct siginfo { | |||
| 62 | int _imm; /* immediate value for "break" */ | 62 | int _imm; /* immediate value for "break" */ |
| 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 | } _sigfault; | 66 | } _sigfault; |
| 66 | 67 | ||
| 67 | /* SIGPOLL */ | 68 | /* SIGPOLL */ |