From owner-p4-projects@FreeBSD.ORG  Tue Oct  5 21:45:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EBDA616A4D1; Tue,  5 Oct 2004 21:45:21 +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 C7B8F16A4CE
	for <perforce@freebsd.org>; Tue,  5 Oct 2004 21:45:21 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BDD3C43D39
	for <perforce@freebsd.org>; Tue,  5 Oct 2004 21:45:21 +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 i95LjL8g081113
	for <perforce@freebsd.org>; Tue, 5 Oct 2004 21:45:21 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i95LjLcO081110
	for perforce@freebsd.org; Tue, 5 Oct 2004 21:45:21 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 5 Oct 2004 21:45:21 GMT
Message-Id: <200410052145.i95LjLcO081110@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 62705 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, 05 Oct 2004 21:45:22 -0000

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

Change 62705 by julian@julian_ref on 2004/10/05 21:45:15

	 fix mismerge

Affected files ...

.. //depot/projects/nsched/sys/kern/sched_ule.c#39 edit

Differences ...

==== //depot/projects/nsched/sys/kern/sched_ule.c#39 (text+ko) ====

@@ -186,18 +186,6 @@
 	    ("slots out of whack"));*/ 					\
 } while (0)
 
-#define SLOT_USE(kg)							\
-do {									\
-	kg->kg_avail_opennings--; 					\
-	CTR3(KTR_RUNQ, "kg %p(%d) Slot used (->%d)",			\
-	kg,								\
-	kg->kg_concurrency,						\
-	 kg->kg_avail_opennings);					\
-	/*KASSERT((kg->kg_avail_opennings >= 0),			\
-	    ("slots out of whack"));*/ 					\
-} while (0)
-
-
 static struct kse kse0;
 static struct kg_sched kg_sched0;