Fix merge error in do_entArith: don't send SIGFPE on

successful emulation.  From Ivan.

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 3dbe7bd38da837738610d6feb221b295225db9ad..a43901ade48958178f7a8c3dbe14f3bce8ad4502 100644 (file)
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -223,6 +223,8 @@ do_entArith(unsigned long summary, unsigned long write_mask,
                        si_code = alpha_fp_emul(regs->pc - 4);
                else
                        si_code = alpha_fp_emul_imprecise(regs, write_mask);
+               if (si_code == 0)
+                       return;
        }
        die_if_kernel("Arithmetic fault", regs, 0, 0);