diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:25:25 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:25:25 -0300 |
| commit | 1ecc72af3224c56e5cca361d1e151e4ec783405a (patch) | |
| tree | 8b61197528ccef7e696fae3a0dd3e0bff199f225 | |
| parent | 3ec7f23324c3579430d2fd9a3408dcfdad78e53b (diff) | |
| download | FreeBSD-src-1ecc72af3224c56e5cca361d1e151e4ec783405a.zip FreeBSD-src-1ecc72af3224c56e5cca361d1e151e4ec783405a.tar.gz | |
Revert "MFC r321919:"
This reverts commit 5b5a512657c1593040d28ac2bc8a48fd895aebca.
| -rw-r--r-- | sys/amd64/amd64/trap.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/trap.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index c2593ce..4a53593 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -375,7 +375,7 @@ trap(struct trapframe *frame) #ifdef DEV_ISA case T_NMI: nmi_handle_intr(type, frame); - goto out; + break; #endif /* DEV_ISA */ case T_OFLOW: /* integer overflow fault */ @@ -413,7 +413,7 @@ trap(struct trapframe *frame) if (dtrace_return_probe_ptr != NULL && dtrace_return_probe_ptr(®s) == 0) goto out; - goto userout; + break; #endif } } else { diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 000ff17..3c8f4b5 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -455,7 +455,7 @@ user_trctrap_out: goto userout; #else /* !POWERFAIL_NMI */ nmi_handle_intr(type, frame); - goto out; + break; #endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ @@ -499,7 +499,7 @@ user_trctrap_out: if (dtrace_return_probe_ptr != NULL && dtrace_return_probe_ptr(®s) == 0) goto out; - goto userout; + break; #endif } } else { |
