Author: kib
Date: Mon Jul 18 04:30:34 2016
New Revision: 302981
URL: https://svnweb.freebsd.org/changeset/base/302981
Log:
Fix another bug after r302350.
Reported and tested by: pho
PR: 210884
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
Modified:
head/sys/kern/kern_exit.c
Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c Mon Jul 18 04:20:26 2016 (r302980)
+++ head/sys/kern/kern_exit.c Mon Jul 18 04:30:34 2016 (r302981)
@@ -345,7 +345,7 @@ exit1(struct thread *td, int rval, int s
* 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),
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
