Commit 92d44a42 authored Apr 13, 2018 by Russell King

ARM: fix kill( ,SIGFPE) breakage



Commit 7771c664 ("signal/arm: Document conflicts with SI_USER and
SIGFPE") broke the siginfo structure for userspace triggered signals,
causing the strace testsuite to regress.  Fix this by eliminating
the FPE_FIXME definition (which is at the root of the breakage) and
use FPE_FLTINV instead for the case where the hardware appears to be
reporting nonsense.

Fixes: 7771c664 ("signal/arm: Document conflicts with SI_USER and SIGFPE")
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

parent 0d73c3f8

arch/arm/include/uapi/asm/siginfo.h

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		#ifndef __ASM_SIGINFO_H
		#define __ASM_SIGINFO_H

		#include <asm-generic/siginfo.h>

		/*
		* SIGFPE si_codes
		*/
		#ifdef __KERNEL__
		#define FPE_FIXME 0 /* Broken dup of SI_USER */
		#endif /* __KERNEL__ */

		#endif

arch/arm/vfp/vfpmodule.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_

		if (exceptions == VFP_EXCEPTION_ERROR) {
		vfp_panic("unhandled bounce", inst);
		vfp_raise_sigfpe(FPE_FIXME, regs);
		vfp_raise_sigfpe(FPE_FLTINV, regs);
		return;
		}