summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2016-07-21 12:50:23 +0000
committerkib <kib@FreeBSD.org>2016-07-21 12:50:23 +0000
commit8d7998f48eb15fdc896d0ef98e4cadd72d2f9bfa (patch)
tree1d3e48ac9a743a4bf4f2897084180ca88461d2de /sys/kern
parent3ed52b716e898e2df2681456420b57dd0b684a41 (diff)
downloadFreeBSD-src-8d7998f48eb15fdc896d0ef98e4cadd72d2f9bfa.zip
FreeBSD-src-8d7998f48eb15fdc896d0ef98e4cadd72d2f9bfa.tar.gz
MFC r302981:
Fix another bug after r302350. Approved by: re (gjb)
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_exit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 7b73236..929c2c0 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -344,7 +344,7 @@ exit1(struct thread *td, int rval, int signo)
* executing, prevent it from rearming itself and let it finish.
*/
if (timevalisset(&p->p_realtimer.it_value) &&
- callout_stop(&p->p_itcallout) == 0) {
+ _callout_stop_safe(&p->p_itcallout, CS_EXECUTING, NULL) == 0) {
timevalclear(&p->p_realtimer.it_interval);
msleep(&p->p_itcallout, &p->p_mtx, PWAIT, "ritwait", 0);
KASSERT(!timevalisset(&p->p_realtimer.it_value),
OpenPOWER on IntegriCloud