summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Souza <luiz@netgate.com>2018-02-21 14:26:05 -0300
committerLuiz Souza <luiz@netgate.com>2018-02-21 14:26:05 -0300
commit911d650e1367dc4a6ac7feb96f47fc87fd6a4984 (patch)
tree82770329ba8c8bcf7d66fed0684d1558b0111623
parentd5d338d0645a10eb2db7605a11d3283bca36d0d2 (diff)
downloadFreeBSD-src-911d650e1367dc4a6ac7feb96f47fc87fd6a4984.zip
FreeBSD-src-911d650e1367dc4a6ac7feb96f47fc87fd6a4984.tar.gz
Revert "MFC r322494:"
This reverts commit 74f422aa0c80a2b2cc5b62800ec3530ffacfd71e.
-rw-r--r--sys/amd64/amd64/trap.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 37246b1..d3adf65 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -166,21 +166,15 @@ trap(struct trapframe *frame)
#ifdef KDTRACE_HOOKS
struct reg regs;
#endif
- ksiginfo_t ksi;
- struct thread *td;
- struct proc *p;
- register_t addr;
+ struct thread *td = curthread;
+ struct proc *p = td->td_proc;
#ifdef KDB
register_t dr6;
#endif
- int i, ucode;
+ int i = 0, ucode = 0;
u_int type;
-
- td = curthread;
- p = td->td_proc;
- i = 0;
- ucode = 0;
- addr = 0;
+ register_t addr = 0;
+ ksiginfo_t ksi;
PCPU_INC(cnt.v_trap);
type = frame->tf_trapno;
OpenPOWER on IntegriCloud