From owner-p4-projects@FreeBSD.ORG  Wed Sep 15 22:47:36 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C7CD16A4D0; Wed, 15 Sep 2004 22:47:36 +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 47DC116A4CE
	for <perforce@freebsd.org>; Wed, 15 Sep 2004 22:47:36 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E66E43D53
	for <perforce@freebsd.org>; Wed, 15 Sep 2004 22:47:36 +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 i8FMla7Z007964
	for <perforce@freebsd.org>; Wed, 15 Sep 2004 22:47:36 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8FMlZrp007961
	for perforce@freebsd.org; Wed, 15 Sep 2004 22:47:35 GMT
	(envelope-from julian@freebsd.org)
Date: Wed, 15 Sep 2004 22:47:35 GMT
Message-Id: <200409152247.i8FMlZrp007961@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 61573 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: Wed, 15 Sep 2004 22:47:37 -0000

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

Change 61573 by julian@julian_ref on 2004/09/15 22:46:43

	 fix backing out of runq addition for preempting threads.

Affected files ...

.. //depot/projects/nsched/sys/kern/kern_switch.c#32 edit

Differences ...

==== //depot/projects/nsched/sys/kern/kern_switch.c#32 (text+ko) ====

@@ -591,8 +591,16 @@
 		/*
 		 * If this is a threaded process we actually ARE on the
 		 * ksegrp run queue so take it off that first.
+		 * Also undo any damage done to the last_assigned pointer.
+		 * XXX Fix setrunqueue so this isn't needed
 		 */
-		remrunqueue(td); /* maybe use a simpler version */
+		struct ksegrp *kg;
+
+		kg = td->td_ksegrp;
+		if (kg->kg_last_assigned == td) 
+			kg->kg_last_assigned =
+			    TAILQ_PREV(td, threadqueue, td_runq);
+		TAILQ_REMOVE(&kg->kg_runq, td, td_runq);
 	}
 		
 	TD_SET_RUNNING(td);