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

Commit 9026e820 authored by Randy Dunlap's avatar Randy Dunlap Committed by Eric W. Biederman
Browse files

fs/signalfd: fix build error for BUS_MCEERR_AR 



Fix build error in fs/signalfd.c by using same method that is used in
kernel/signal.c: separate blocks for different signal si_code values.

./fs/signalfd.c: error: 'BUS_MCEERR_AR' undeclared (first use in this function)

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 7928b2cb

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