diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:41:05 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:41:05 -0300 |
| commit | d37f02407b37996ac96b0c17a5c9d58c5273457a (patch) | |
| tree | 04ae08e499b8bcced33aff115b8eb87f5d0f4b2d | |
| parent | 973bd915340bc21e94a0fbe6374107ba715729c4 (diff) | |
| download | FreeBSD-src-d37f02407b37996ac96b0c17a5c9d58c5273457a.zip FreeBSD-src-d37f02407b37996ac96b0c17a5c9d58c5273457a.tar.gz | |
Revert "Revert "MFC r322718:""
This reverts commit d5d338d0645a10eb2db7605a11d3283bca36d0d2.
| -rw-r--r-- | sys/amd64/amd64/trap.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 37246b1..d936013 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -609,17 +609,20 @@ trap_check(struct trapframe *frame) } static int -trap_pfault(frame, usermode) - struct trapframe *frame; - int usermode; +trap_pfault(struct trapframe *frame, int usermode) { - vm_offset_t va; + struct thread *td; + struct proc *p; vm_map_t map; - int rv = 0; + vm_offset_t va; + int rv; vm_prot_t ftype; - struct thread *td = curthread; - struct proc *p = td->td_proc; - vm_offset_t eva = frame->tf_addr; + vm_offset_t eva; + + td = curthread; + p = td->td_proc; + eva = frame->tf_addr; + rv = 0; if (__predict_false((td->td_pflags & TDP_NOFAULTING) != 0)) { /* |
