4 files changed, 7 insertions, 12 deletions

diff --git a/arch/parisc/include/uapi/asm/siginfo.h b/arch/parisc/include/uapi/asm/siginfo.h
index be40331f757d..4a1062e05aaf 100644
--- a/arch/parisc/include/uapi/asm/siginfo.h
+++ b/arch/parisc/include/uapi/asm/siginfo.h
@@ -8,11 +8,4 @@
 
 #include <asm-generic/siginfo.h>
 
-/*
- * SIGFPE si_codes
- */
-#ifdef __KERNEL__
-#define FPE_FIXME       0       /* Broken dup of SI_USER */
-#endif /* __KERNEL__ */
-
 #endif
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index c919e6c0a687..68e671a11987 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -627,9 +627,10 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
                    on condition  */
                 if(user_mode(regs)){
                         si.si_signo = SIGFPE;
-                        /* Set to zero, and let the userspace app figure it out from
-                           the insn pointed to by si_addr */
-                        si.si_code = FPE_FIXME;
+                        /* Let userspace app figure it out from the insn pointed
+                         * to by si_addr.
+                         */
+                        si.si_code = FPE_CONDTRAP;
                         si.si_addr = (void __user *) regs->iaoq[0];
                         force_sig_info(SIGFPE, &si, current);
                         return;
diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
index df92605d8724..14c057f29979 100644
--- a/arch/x86/kernel/signal_compat.c
+++ b/arch/x86/kernel/signal_compat.c
@@ -26,7 +26,7 @@ static inline void signal_compat_build_tests(void)
          * new fields are handled in copy_siginfo_to_user32()!
          */
         BUILD_BUG_ON(NSIGILL  != 11);
-        BUILD_BUG_ON(NSIGFPE  != 14);
+        BUILD_BUG_ON(NSIGFPE  != 15);
         BUILD_BUG_ON(NSIGSEGV != 7);
         BUILD_BUG_ON(NSIGBUS  != 5);
         BUILD_BUG_ON(NSIGTRAP != 4);
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index 544208fd3db1..558b902f18d4 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -211,7 +211,8 @@ typedef struct siginfo {
 #define __FPE_INVASC    12      /* invalid ASCII digit */
 #define __FPE_INVDEC    13      /* invalid decimal digit */
 #define FPE_FLTUNK      14      /* undiagnosed floating-point exception */
-#define NSIGFPE         14
+#define FPE_CONDTRAP    15      /* trap on condition */
+#define NSIGFPE         15
 
 /*
  * SIGSEGV si_codes