diff options
author | Renato Botelho <renato@netgate.com> | 2016-08-17 15:23:38 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-08-17 15:23:38 -0300 |
commit | 75cd8d40056c799f03b759475d9bfd10ba266a6c (patch) | |
tree | 60433235501684bffeab90e65139a8285fcf46a9 /sys/kern/kern_exit.c | |
parent | 99990a0d149f0eae805aa1f49d4a61be30c3b000 (diff) | |
parent | ad413762f28e3be343987e707b9cf4f10f963693 (diff) | |
download | FreeBSD-src-75cd8d40056c799f03b759475d9bfd10ba266a6c.zip FreeBSD-src-75cd8d40056c799f03b759475d9bfd10ba266a6c.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/kern/kern_exit.c')
-rw-r--r-- | sys/kern/kern_exit.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index f9244af..c362530 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -336,6 +336,7 @@ exit1(struct thread *td, int rv) rv = p->p_xstat; /* Event handler could change exit status */ stopprofclock(p); p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); + p->p_ptevents = 0; /* * Stop the real interval timer. If the handler is currently @@ -519,8 +520,12 @@ exit1(struct thread *td, int rv) */ clear_orphan(q); q->p_flag &= ~(P_TRACED | P_STOPPED_TRACE); - FOREACH_THREAD_IN_PROC(q, tdt) - tdt->td_dbgflags &= ~TDB_SUSPEND; + q->p_flag2 &= ~P2_PTRACE_FSTP; + q->p_ptevents = 0; + FOREACH_THREAD_IN_PROC(q, tdt) { + tdt->td_dbgflags &= ~(TDB_SUSPEND | TDB_XSIG | + TDB_FSTP); + } kern_psignal(q, SIGKILL); } PROC_UNLOCK(q); |