Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

parisc/signal: Add FPE_CONDTRAP for conditional trap handling

Browse source 
Posix and common sense requires that SI_USER not be a signal specific
si_code. Thus add a new FPE_CONDTRAP si_code for conditional traps.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
Helge Deller 2018-01-13 19:32:43 -06:00
parent b284d4d5a6
commit 75abf64287
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/parisc/include/uapi/asm/siginfo.h
View file

@ -8,11 +8,4 @@
#include <asm-generic/siginfo.h> #include <asm-generic/siginfo.h>
/*
* SIGFPE si_codes
*/
#ifdef __KERNEL__
#define FPE_FIXME 0 /* Broken dup of SI_USER */
#endif /* __KERNEL__ */
#endif #endif

7
arch/parisc/kernel/traps.c
View file

@ -627,9 +627,10 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
on condition */ on condition */
if(user_mode(regs)){ if(user_mode(regs)){
si.si_signo = SIGFPE; si.si_signo = SIGFPE;
/* Set to zero, and let the userspace app figure it out from /* Let userspace app figure it out from the insn pointed
the insn pointed to by si_addr */ * to by si_addr.
si.si_code = FPE_FIXME; */
si.si_code = FPE_CONDTRAP;
si.si_addr = (void __user *) regs->iaoq[0]; si.si_addr = (void __user *) regs->iaoq[0];
force_sig_info(SIGFPE, &si, current); force_sig_info(SIGFPE, &si, current);
return; return;

2
arch/x86/kernel/signal_compat.c
View file

@ -26,7 +26,7 @@ static inline void signal_compat_build_tests(void)
* new fields are handled in copy_siginfo_to_user32()! * new fields are handled in copy_siginfo_to_user32()!
*/ */
BUILD_BUG_ON(NSIGILL != 11); BUILD_BUG_ON(NSIGILL != 11);
BUILD_BUG_ON(NSIGFPE != 14); BUILD_BUG_ON(NSIGFPE != 15);
BUILD_BUG_ON(NSIGSEGV != 7); BUILD_BUG_ON(NSIGSEGV != 7);
BUILD_BUG_ON(NSIGBUS != 5); BUILD_BUG_ON(NSIGBUS != 5);
BUILD_BUG_ON(NSIGTRAP != 4); BUILD_BUG_ON(NSIGTRAP != 4);

3
include/uapi/asm-generic/siginfo.h
View file

@ -211,7 +211,8 @@ typedef struct siginfo {
#define __FPE_INVASC 12 /* invalid ASCII digit */ #define __FPE_INVASC 12 /* invalid ASCII digit */
#define __FPE_INVDEC 13 /* invalid decimal digit */ #define __FPE_INVDEC 13 /* invalid decimal digit */
#define FPE_FLTUNK 14 /* undiagnosed floating-point exception */ #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */
#define NSIGFPE 14 #define FPE_CONDTRAP 15 /* trap on condition */
#define NSIGFPE 15
/* /*
* SIGSEGV si_codes * SIGSEGV si_codes