diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2017-10-27 03:16:19 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2017-10-27 03:16:19 +0000 |
| commit | e012fe34cb73a684457928586d82872998e3644c (patch) | |
| tree | 520e232493aa014dbb4be6200602011fba2527d9 /sys | |
| parent | c136b6ecee507f768126e4b5fec5791b37707115 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/sys_process.c | 7 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 2f59cb5e78bd..8a7e0d99d114 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1129,6 +1129,13 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) } sendsig: + /* + * Clear the pending event for the thread that just + * reported its event (p_xthread). This may not be + * the thread passed to PT_CONTINUE, PT_STEP, etc. if + * the debugger is resuming a different thread. + */ + td2 = p->p_xthread; if (proctree_locked) { sx_xunlock(&proctree_lock); proctree_locked = 0; diff --git a/sys/sys/param.h b/sys/sys/param.h index 65f36efb430d..e899d403b9b1 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1200051 /* Master, propagated to newvers */ +#define __FreeBSD_version 1200052 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |