From 7e1281f6411ce375304d8fa398e1b21508ee0a44 Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Wed, 9 Aug 2017 08:57:00 +0000
Subject: MFC r321919: Do not call trapsignal() after handling usermode fault
 or interrupt, when a signal is not intended to be sent.

---
 sys/amd64/amd64/trap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sys/amd64')

diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index d3adf65..7539422 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -370,7 +370,7 @@ trap(struct trapframe *frame)
 #ifdef DEV_ISA
 		case T_NMI:
 			nmi_handle_intr(type, frame);
-			break;
+			goto out;
 #endif /* DEV_ISA */
 
 		case T_OFLOW:		/* integer overflow fault */
@@ -408,7 +408,7 @@ trap(struct trapframe *frame)
 			if (dtrace_return_probe_ptr != NULL &&
 			    dtrace_return_probe_ptr(&regs) == 0)
 				goto out;
-			break;
+			goto userout;
 #endif
 		}
 	} else {
-- 
cgit v1.1