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