projects/linux·commit 076a9bca

signal/mips: Remove FPE_FIXME usage from mips

076a9bca · Eric W. Biederman <[email protected]> · 2017-09-05 08:42:47 -05:00

Ralf Baechle recently merged a change to stop explicitly handling this
case on mips, as the case is impossible.  Unfortunately when the code
in force_fcr31_sig to not use siginfo but a simple interger variable gcc
starts warning about an unitialized variable.

So add a return statement so gcc knows the code never attempts to use
the impossible value.

Cc: Ralf Baechle <[email protected]>
Signed-off-by: "Eric W. Biederman" <[email protected]>
Commit
076a9bcacfc7ccbc2b3fdf3bd490718f6b182419
Parents
8db6c34f · 20229305

Merge commit. Changes below are compared with the first parent: 8db6c34f.

Changes

2 files changed · +1 −8

FileStatusAddDelContent
arch/mips/include/uapi/asm/siginfo.hmodified+0−7View file
arch/mips/kernel/traps.cmodified+1−1View file

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

View file
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
index 22a86d8..cf6113b 100644
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -123,11 +123,4 @@ typedef struct siginfo {
#define SI_TIMER -3 /* sent by timer expiration */
#define SI_MESGQ -4 /* sent by real time mesq state change */
-/*
- * SIGFPE si_codes
- */
-#ifdef __KERNEL__
-#define FPE_FIXME 0 /* Broken dup of SI_USER */
-#endif /* __KERNEL__ */
-
#endif /* _UAPI_ASM_SIGINFO_H */

arch/mips/kernel/traps.c

View file
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 6c9cca9..2bf4149 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -735,7 +735,7 @@ void force_fcr31_sig(unsigned long fcr31, void __user *fault_addr,
else if (fcr31 & FPU_CSR_INE_X)
si.si_code = FPE_FLTRES;
else
- si.si_code = FPE_FIXME;
+ return; /* Broken hardware? */
force_sig_info(SIGFPE, &si, tsk);
}