svn commit: r303141 - stable/11/sys/kern

[Konstantin Belousov]

Author: kib
Date: Thu Jul 21 12:50:23 2016
New Revision: 303141
URL: https://svnweb.freebsd.org/changeset/base/303141

Log:
  MFC r302981:
  Fix another bug after r302350.
  
  Approved by:	re (gjb)

Modified:
  stable/11/sys/kern/kern_exit.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_exit.c
==============================================================================
--- stable/11/sys/kern/kern_exit.c	Thu Jul 21 12:15:04 2016	(r303140)
+++ stable/11/sys/kern/kern_exit.c	Thu Jul 21 12:50:23 2016	(r303141)
@@ -344,7 +344,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),