aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen2010-10-22 17:40:07 +0200
committerAndi Kleen2010-10-22 17:40:07 +0200
commitdf27570f43923c246567b074418411c06cf0dce2 (patch)
tree1390735b5232b579f6eb0bb9bb25df019d4ce795 /arch
parentd4429f608abde89e8bc1e24b43cd503feb95c496 (diff)
parentf7cb8b5ffd16edad64ae16ee38c561f98cbcaa3b (diff)
Merge branch 'hwpoison-fixes-2.6.37' into hwpoison
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/include/asm/siginfo.h1
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 {
int _imm; /* immediate value for "break" */
unsigned int _flags; /* see below */
unsigned long _isr; /* isr */
+ short _addr_lsb; /* lsb of faulting address */
} _sigfault;
/* SIGPOLL */