summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2018-02-21 14:25:51 -0300
committerLuiz Souza <luiz@netgate.com>2018-02-21 14:25:51 -0300
commitd5d338d0645a10eb2db7605a11d3283bca36d0d2 (patch)
treef53762d0837216a6ff470d0baf6050df661a8707
parent849d0f4ce8c8dbc0c5bfae77de687dd260274b0c (diff)
downloadFreeBSD-src-d5d338d0645a10eb2db7605a11d3283bca36d0d2.zip
FreeBSD-src-d5d338d0645a10eb2db7605a11d3283bca36d0d2.tar.gz
Revert "MFC r322718:"
This reverts commit d574a360a44f0e9e7f2ac9410d978250eff2eee4.
-rw-r--r--sys/amd64/amd64/trap.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index d936013..37246b1 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -609,20 +609,17 @@ trap_check(struct trapframe *frame)
}
static int
-trap_pfault(struct trapframe *frame, int usermode)
+trap_pfault(frame, usermode)
+ struct trapframe *frame;
+ int usermode;
{
- struct thread *td;
- struct proc *p;
- vm_map_t map;
vm_offset_t va;
- int rv;
+ vm_map_t map;
+ int rv = 0;
vm_prot_t ftype;
- vm_offset_t eva;
-
- td = curthread;
- p = td->td_proc;
- eva = frame->tf_addr;
- rv = 0;
+ struct thread *td = curthread;
+ struct proc *p = td->td_proc;
+ vm_offset_t eva = frame->tf_addr;
if (__predict_false((td->td_pflags & TDP_NOFAULTING) != 0)) {
/*
OpenPOWER on IntegriCloud