From owner-p4-projects@FreeBSD.ORG  Sun Jun 20 21:10:54 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38A6316A4D1; Sun, 20 Jun 2004 21:10:54 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0CFF216A4CE
	for <perforce@freebsd.org>; Sun, 20 Jun 2004 21:10:54 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 05F9243D39
	for <perforce@freebsd.org>; Sun, 20 Jun 2004 21:10:54 +0000 (GMT)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KLAoxK068507
	for <perforce@freebsd.org>; Sun, 20 Jun 2004 21:10:50 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KLAog1068504
	for perforce@freebsd.org; Sun, 20 Jun 2004 21:10:50 GMT
	(envelope-from julian@freebsd.org)
Date: Sun, 20 Jun 2004 21:10:50 GMT
Message-Id: <200406202110.i5KLAog1068504@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 55400 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jun 2004 21:10:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=55400

Change 55400 by julian@julian_ref on 2004/06/20 21:10:48

	compile this time..

Affected files ...

.. //depot/projects/nsched/sys/kern/kern_exec.c#6 edit
.. //depot/projects/nsched/sys/kern/kern_exit.c#12 edit

Differences ...

==== //depot/projects/nsched/sys/kern/kern_exec.c#6 (text+ko) ====

@@ -53,6 +53,7 @@
 #include <sys/namei.h>
 #include <sys/sf_buf.h>
 #include <sys/sysent.h>
+#include <sys/sched.h>
 #include <sys/shm.h>
 #include <sys/sysctl.h>
 #include <sys/user.h>
@@ -266,10 +267,10 @@
 		 * This meams that we must get rid of any extra
 		 * upcalls and kses we may have picked up along the way.
 		 */
-		mtx_lock_spin(&sched_lock):
-		sched_set_concurrancy(td, 1);
+		mtx_lock_spin(&sched_lock);
+		sched_set_concurrancy(td->td_ksegrp, 1);
 		upcall_remove(td);
-		mtx_unlock_spin(&sched_lock):
+		mtx_unlock_spin(&sched_lock);
 		p->p_flag &= ~(P_SA|P_HADTHREADS);
 		td->td_mailbox = NULL;
 		td->td_pflags &= ~TDP_SA;

==== //depot/projects/nsched/sys/kern/kern_exit.c#12 (text+ko) ====

@@ -166,10 +166,10 @@
 		 * ...
 		 * Turn off threading support.
 		 */
-		mtx_lock_spin(&sched_lock):
-		sched_set_concurrancy(td, 1);
+		mtx_lock_spin(&sched_lock);
+		sched_set_concurrancy(td->td_ksegrp, 1);
 		upcall_remove(td);
-		mtx_unlock_spin(&sched_lock):
+		mtx_unlock_spin(&sched_lock);
 		p->p_flag &= ~(P_SA|P_HADTHREADS);
 		td->td_mailbox = NULL;
 		td->td_pflags &= ~TDP_SA;