Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bae6cfe8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'siginfo-linus' of... 

Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull siginfo fix from Eric Biederman:
 "This fixes a build error that only shows up on blackfin"

* 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  fs/signalfd: fix build error for BUS_MCEERR_AR
parents 0bb78166 9026e820

fs/signalfd.c

+12 −3
Original line number Diff line number Diff line
@@ -123,8 +123,17 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, 
		 * so check explicitly for the right codes here.

		 */

		if (kinfo->si_signo == SIGBUS &&

		    (kinfo->si_code == BUS_MCEERR_AR ||

		     kinfo->si_code == BUS_MCEERR_AO))

		     kinfo->si_code == BUS_MCEERR_AO)

			err |= __put_user((short) kinfo->si_addr_lsb,

					  &uinfo->ssi_addr_lsb);

#endif

#ifdef BUS_MCEERR_AR

		/*

		 * Other callers might not initialize the si_lsb field,

		 * so check explicitly for the right codes here.

		 */

		if (kinfo->si_signo == SIGBUS &&

		    kinfo->si_code == BUS_MCEERR_AR)

			err |= __put_user((short) kinfo->si_addr_lsb,

					  &uinfo->ssi_addr_lsb);

#endif