From owner-p4-projects  Tue Apr  2 23:26:20 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C27337B417; Tue,  2 Apr 2002 23:26:13 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8C79137B41A
	for <perforce@freebsd.org>; Tue,  2 Apr 2002 23:26:11 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g337QBm65145
	for perforce@freebsd.org; Tue, 2 Apr 2002 23:26:11 -0800 (PST)
	(envelope-from julian@freebsd.org)
Date: Tue, 2 Apr 2002 23:26:11 -0800 (PST)
Message-Id: <200204030726.g337QBm65145@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
Subject: PERFORCE change 8952 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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