From owner-p4-projects@FreeBSD.ORG  Sat Apr  3 23:00:51 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A54E16A4D0; Sat,  3 Apr 2004 23:00:51 -0800 (PST)
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 43ECF16A4CE
	for <perforce@freebsd.org>; Sat,  3 Apr 2004 23:00:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3CBDA43D1D
	for <perforce@freebsd.org>; Sat,  3 Apr 2004 23:00:51 -0800 (PST)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3470pGe013510
	for <perforce@freebsd.org>; Sat, 3 Apr 2004 23:00:51 -0800 (PST)
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3470oPC013507
	for perforce@freebsd.org; Sat, 3 Apr 2004 23:00:50 -0800 (PST)
	(envelope-from julian@freebsd.org)
Date: Sat, 3 Apr 2004 23:00:50 -0800 (PST)
Message-Id: <200404040700.i3470oPC013507@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 50317 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, 04 Apr 2004 07:00:52 -0000

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

Change 50317 by julian@julian_jules1 on 2004/04/03 23:00:45

	hack on hack.. clean this up soon.

Affected files ...

.. //depot/projects/nsched/sys/kern/init_main.c#5 edit
.. //depot/projects/nsched/sys/kern/scheduler/4bsd/sched_4bsd_kse.c#6 edit

Differences ...

==== //depot/projects/nsched/sys/kern/init_main.c#5 (text+ko) ====

@@ -335,10 +335,10 @@
 	 * Initialize thread, process and pgrp structures.
 	 * Note, proc_linkup calls scheduler init routines for
 	 * per-thread and per-ksegrp schedular areas which will undo
-	 * what schedinit() does, so call that AFTER the proc_linkup.
+	 * what schedinit() does,  but that requires that schedinit has run
+	 * so schedinit calls proc_linkup.
 	 * XXXKSE needs cleaning up.
 	 */
-	proc_linkup(&proc0, &ksegrp0, &thread0);
 	procinit();	/* set up proc zone */
 	threadinit();	/* set up thead, upcall and KSEGRP zones */
 	schedinit();	/* scheduler gets its house in order */

==== //depot/projects/nsched/sys/kern/scheduler/4bsd/sched_4bsd_kse.c#6 (text+ko) ====

@@ -86,6 +86,7 @@
 	proc0.p_sched = NULL; /* XXX */
 	thread0.td_sched = &td_sched0;
 
+	proc_linkup(&proc0, &ksegrp0, &thread0);
 	kse0.ke_state = KES_THREAD;
 	kse_link(&proc0, &kse0, &ksegrp0);
 	kse0.ke_thread = &thread0;