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 /fs | |
| parent | d4429f608abde89e8bc1e24b43cd503feb95c496 (diff) | |
| parent | f7cb8b5ffd16edad64ae16ee38c561f98cbcaa3b (diff) | |
Merge branch 'hwpoison-fixes-2.6.37' into hwpoison
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/signalfd.c | 10 |
1 files changed, 10 insertions, 0 deletions
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, | |||
| 99 | #ifdef __ARCH_SI_TRAPNO | 99 | #ifdef __ARCH_SI_TRAPNO |
| 100 | err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno); | 100 | err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno); |
| 101 | #endif | 101 | #endif |
| 102 | #ifdef BUS_MCEERR_AO | ||
| 103 | /* | ||
| 104 | * Other callers might not initialize the si_lsb field, | ||
| 105 | * so check explicitly for the right codes here. | ||
| 106 | */ | ||
| 107 | if (kinfo->si_code == BUS_MCEERR_AR || | ||
| 108 | kinfo->si_code == BUS_MCEERR_AO) | ||
| 109 | err |= __put_user((short) kinfo->si_addr_lsb, | ||
| 110 | &uinfo->ssi_addr_lsb); | ||
| 111 | #endif | ||
| 102 | break; | 112 | break; |
| 103 | case __SI_CHLD: | 113 | case __SI_CHLD: |
| 104 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); | 114 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); |