diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:41:26 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:41:26 -0300 |
| commit | e6a7cb1ff4807e029eee190a3dba721444ec0090 (patch) | |
| tree | 0c5a4d12ee7082fad2e2254b8fb885fcd18718f1 /sys | |
| parent | 6f0f058561098fab25a14ce162922ab157aeb96e (diff) | |
| download | FreeBSD-src-e6a7cb1ff4807e029eee190a3dba721444ec0090.zip FreeBSD-src-e6a7cb1ff4807e029eee190a3dba721444ec0090.tar.gz | |
Revert "Revert "MFC r321919:""
This reverts commit 1ecc72af3224c56e5cca361d1e151e4ec783405a.
Diffstat (limited to 'sys')
| -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 4a53593..c2593ce 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); - break; + goto out; #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; - break; + goto userout; #endif } } else { diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 3c8f4b5..000ff17 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); - break; + goto out; #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; - break; + goto userout; #endif } } else { |
