D34625.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34625.diff
View Options

	diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
	--- a/sys/kern/kern_exit.c
	+++ b/sys/kern/kern_exit.c
	@@ -369,15 +369,14 @@
	* executing, prevent it from rearming itself and let it finish.
	*/
	if (timevalisset(&p->p_realtimer.it_value) &&
	- _callout_stop_safe(&p->p_itcallout, CS_EXECUTING, NULL) == 0) {
	+ callout_stop(&p->p_itcallout) == 0) {
	timevalclear(&p->p_realtimer.it_interval);
	- msleep(&p->p_itcallout, &p->p_mtx, PWAIT, "ritwait", 0);
	- KASSERT(!timevalisset(&p->p_realtimer.it_value),
	- ("realtime timer is still armed"));
	+ PROC_UNLOCK(p);
	+ callout_drain(&p->p_itcallout);
	+ } else {
	+ PROC_UNLOCK(p);
	}

	- PROC_UNLOCK(p);
	-
	if (p->p_sysent->sv_onexit != NULL)
	p->p_sysent->sv_onexit(p);
	seltdfini(td);
	diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
	--- a/sys/kern/kern_time.c
	+++ b/sys/kern/kern_time.c
	@@ -950,8 +950,6 @@
	kern_psignal(p, SIGALRM);
	if (!timevalisset(&p->p_realtimer.it_interval)) {
	timevalclear(&p->p_realtimer.it_value);
	- if (p->p_flag & P_WEXIT)
	- wakeup(&p->p_itcallout);
	return;
	}