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

successful emulation. From Ivan.

Fix merge error in do_entArith: don't send SIGFPE on
successful emulation. From Ivan.
1c819f89 · Richard Henderson · Richard Henderson · 7985f163 · 1c819f89
Commit 1c819f89 authored Nov 07, 2002 by Richard Henderson Committed by Richard Henderson Nov 07, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

arch/alpha/kernel/traps.c arch/alpha/kernel/traps.c +2 -0

No files found.
--- 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);