diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:59:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:59:32 -0700 |
| commit | 6b0cd00bc396daf5c2dcf17a8d82055335341f46 (patch) | |
| tree | a63db9ea2871bcd05f3cb95fc152be33ea929a1a /kernel | |
| parent | c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea (diff) | |
| parent | 47f43e7efadacc627f325aba64c6a547de0926db (diff) | |
| download | op-kernel-dev-6b0cd00bc396daf5c2dcf17a8d82055335341f46.zip op-kernel-dev-6b0cd00bc396daf5c2dcf17a8d82055335341f46.tar.gz | |
Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
* 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
HWPOISON: Stop shrinking at right page count
HWPOISON: Report correct address granuality for AO huge page errors
HWPOISON: Copy si_addr_lsb to user
page-types.c: fix name of unpoison interface
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/signal.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index bded651..919562c 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2215,6 +2215,14 @@ int copy_siginfo_to_user(siginfo_t __user *to, siginfo_t *from) #ifdef __ARCH_SI_TRAPNO err |= __put_user(from->si_trapno, &to->si_trapno); #endif +#ifdef BUS_MCEERR_AO + /* + * Other callers might not initialize the si_lsb field, + * so check explicitely for the right codes here. + */ + if (from->si_code == BUS_MCEERR_AR || from->si_code == BUS_MCEERR_AO) + err |= __put_user(from->si_addr_lsb, &to->si_addr_lsb); +#endif break; case __SI_CHLD: err |= __put_user(from->si_pid, &to->si_pid); |
