From owner-p4-projects@FreeBSD.ORG  Wed Aug 13 10:51:30 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D145C37B401; Wed, 13 Aug 2003 10:51:29 -0700 (PDT)
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 5763A37B404
	for <perforce@freebsd.org>; Wed, 13 Aug 2003 10:51:29 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 639D743F75
	for <perforce@freebsd.org>; Wed, 13 Aug 2003 10:51:28 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7DHpS0U052794
	for <perforce@freebsd.org>; Wed, 13 Aug 2003 10:51:28 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7DHpRem052791
	for perforce@freebsd.org; Wed, 13 Aug 2003 10:51:27 -0700 (PDT)
Date: Wed, 13 Aug 2003 10:51:27 -0700 (PDT)
Message-Id: <200308131751.h7DHpRem052791@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 36048 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, 13 Aug 2003 17:51:30 -0000

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

Change 36048 by cvance@cvance_osx_laptop on 2003/08/13 10:50:57

	wait_queue_t is a pointer, not a structure, so make sure it gets
	allocated before initialization.  The Mach wait_queue_alloc() function
	does both.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_condvar.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/kern/kern_condvar.c#4 (text+ko) ====

@@ -44,9 +44,9 @@
 {
 
 	bzero(cvp, sizeof(*cvp));
-	if (wait_queue_init(cvp->cv_wait_queue, SYNC_POLICY_FIFO) !=
-	    KERN_SUCCESS)
-		panic("cv_init: wait_queue_init failed");
+	cvp->cv_wait_queue = wait_queue_alloc(SYNC_POLICY_FIFO);
+	if (cvp->cv_wait_queue == WAIT_QUEUE_NULL)
+		panic("cv_init: wait_queue_alloc failed");
 }
 
 void
@@ -61,6 +61,7 @@
 	if (!wait_queue_is_queue(cvp->cv_wait_queue))
 		panic("cv_destroy: !wait_queue_is_queue");
 #endif
+	wait_queue_free(cvp->cv_wait_queue);
 	bzero(cvp, sizeof(*cvp));
 }