diff options
| author | Andi Kleen <ak@linux.intel.com> | 2010-10-22 17:40:07 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-10-22 17:40:07 +0200 |
| commit | df27570f43923c246567b074418411c06cf0dce2 (patch) | |
| tree | 1390735b5232b579f6eb0bb9bb25df019d4ce795 | |
| parent | d4429f608abde89e8bc1e24b43cd503feb95c496 (diff) | |
| parent | f7cb8b5ffd16edad64ae16ee38c561f98cbcaa3b (diff) | |
| download | blackbird-obmc-linux-df27570f43923c246567b074418411c06cf0dce2.tar.gz blackbird-obmc-linux-df27570f43923c246567b074418411c06cf0dce2.zip | |
Merge branch 'hwpoison-fixes-2.6.37' into hwpoison
| -rw-r--r-- | arch/ia64/include/asm/siginfo.h | 1 | ||||
| -rw-r--r-- | fs/signalfd.c | 10 | ||||
| -rw-r--r-- | include/linux/signalfd.h | 3 |
3 files changed, 13 insertions, 1 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 */ diff --git a/fs/signalfd.c b/fs/signalfd.c index 1c5a6add779d..bdd4496ae67f 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -99,6 +99,16 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, #ifdef __ARCH_SI_TRAPNO err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno); #endif +#ifdef BUS_MCEERR_AO + /* + * Other callers might not initialize the si_lsb field, + * so check explicitly for the right codes here. + */ + if (kinfo->si_code == BUS_MCEERR_AR || + kinfo->si_code == BUS_MCEERR_AO) + err |= __put_user((short) kinfo->si_addr_lsb, + &uinfo->ssi_addr_lsb); +#endif break; case __SI_CHLD: err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h index b363b916c909..3ff4961da9b5 100644 --- a/include/linux/signalfd.h +++ b/include/linux/signalfd.h @@ -33,6 +33,7 @@ struct signalfd_siginfo { __u64 ssi_utime; __u64 ssi_stime; __u64 ssi_addr; + __u16 ssi_addr_lsb; /* * Pad strcture to 128 bytes. Remember to update the @@ -43,7 +44,7 @@ struct signalfd_siginfo { * comes out of a read(2) and we really don't want to have * a compat on read(2). */ - __u8 __pad[48]; + __u8 __pad[46]; }; |
