Date: Tue, 2 Apr 2002 23:26:11 -0800 (PST) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8952 for review Message-ID: <200204030726.g337QBm65145@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8952 Change 8952 by julian@julian_ref on 2002/04/02 23:26:06 Catch a few mis-merges I don't know if the critnest fix is correct but it matches changes elsewhere in -current. Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#59 edit ... //depot/projects/kse/sys/kern/kern_thread.c#40 edit ... //depot/projects/kse/sys/kern/sys_generic.c#21 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#59 (text+ko) ==== @@ -348,7 +348,7 @@ } td2 = thread_get(); if (td2 == NULL) { - zfree(proc_zone, p2); + uma_zfree(proc_zone, p2); nprocs--; if (p1->p_flag & P_KSES) thread_single_end(); ==== //depot/projects/kse/sys/kern/kern_thread.c#40 (text+ko) ==== @@ -240,7 +240,6 @@ kg->kg_numthreads++; if (p->p_numthreads > 4) Debugger("OIKS"); td->td_critnest = 0; - td->td_savecrit = 0; td->td_kse = NULL; } ==== //depot/projects/kse/sys/kern/sys_generic.c#21 (text+ko) ==== @@ -1188,7 +1188,7 @@ sip->si_thread = NULL; mtx_lock_spin(&sched_lock); if (td->td_wchan == (caddr_t)&selwait) { - if (td->td_proc->p_stat == SSLEEP) + if (td->td_state == TDS_SLP) setrunnable(td); else cv_waitq_remove(td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204030726.g337QBm65145>