From owner-p4-projects@FreeBSD.ORG  Tue Sep 14 22:48:49 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F2FD16A4D0; Tue, 14 Sep 2004 22:48:49 +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 54CC216A4CE
	for <perforce@freebsd.org>; Tue, 14 Sep 2004 22:48:49 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 492FE43D39
	for <perforce@freebsd.org>; Tue, 14 Sep 2004 22:48:49 +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 i8EMmnqW033607
	for <perforce@freebsd.org>; Tue, 14 Sep 2004 22:48:49 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8EMmmMe033604
	for perforce@freebsd.org; Tue, 14 Sep 2004 22:48:48 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 14 Sep 2004 22:48:48 GMT
Message-Id: <200409142248.i8EMmmMe033604@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 61512 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: Tue, 14 Sep 2004 22:48:50 -0000

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

Change 61512 by julian@julian_ref on 2004/09/14 22:48:19

	 fix small mismerge

Affected files ...

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

Differences ...

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

@@ -564,7 +564,7 @@
 	KASSERT ((ctd->td_kse != NULL && ctd->td_kse->ke_thread == ctd),
 	  ("thread has no (or wrong) sched-private part."));
 	KASSERT((td->td_inhibitors == 0),
-			("setrunqueue: trying to run inhibitted thread"));
+			("maybe_preempt: trying to run inhibitted thread"));
 	pri = td->td_priority;
 	cpri = ctd->td_priority;
 	if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) ||