diff options
| author | kib <kib@FreeBSD.org> | 2017-08-09 09:16:16 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-08-09 09:16:16 +0000 |
| commit | 4bd3f95feae83eb6c4c0666d1ba6e24488470762 (patch) | |
| tree | 66cd53c5123ccac911ddee177ec5a84a5f33c373 | |
| parent | ea4cc0a8c525a6dd45b8f6d2b67711e6dfe554a0 (diff) | |
| download | FreeBSD-src-4bd3f95feae83eb6c4c0666d1ba6e24488470762.zip FreeBSD-src-4bd3f95feae83eb6c4c0666d1ba6e24488470762.tar.gz | |
MFC r321919:
Do not call trapsignal() after handling usermode fault or interrupt,
when a signal is not intended to be sent.
| -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 ab52a7e..8aa3ee2 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -396,7 +396,7 @@ trap(struct trapframe *frame) goto userout; } else if (panic_on_nmi) panic("NMI indicates hardware failure"); - break; + goto out; #endif /* DEV_ISA */ case T_OFLOW: /* integer overflow fault */ @@ -434,7 +434,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 a0bd0a2..f7a37db 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -469,7 +469,7 @@ trap(struct trapframe *frame) goto userout; } else if (panic_on_nmi) panic("NMI indicates hardware failure"); - break; + goto out; #endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ @@ -519,7 +519,7 @@ trap(struct trapframe *frame) if (dtrace_return_probe_ptr != NULL && dtrace_return_probe_ptr(®s) == 0) goto out; - break; + goto userout; #endif } } else { |
