From owner-trustedbsd-cvs@FreeBSD.ORG  Thu Sep  7 14:22:47 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CF70416A4DE
	for <trustedbsd-cvs@freebsd.org>; Thu,  7 Sep 2006 14:22:47 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9388843D79
	for <trustedbsd-cvs@freebsd.org>; Thu,  7 Sep 2006 14:22:34 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 0EE6A46D65
	for <trustedbsd-cvs@trustedbsd.org>;
	Thu,  7 Sep 2006 10:22:34 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 49D4591E75;
	Thu,  7 Sep 2006 14:03:57 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4161416A4E1; Thu,  7 Sep 2006 14:03:57 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 0CF6116A4DD
	for <perforce@freebsd.org>; Thu,  7 Sep 2006 14:03:57 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CDE0B43D45
	for <perforce@freebsd.org>; Thu,  7 Sep 2006 14:03:56 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87E3uBM019249
	for <perforce@freebsd.org>; Thu, 7 Sep 2006 14:03:56 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87E3uhC019246
	for perforce@freebsd.org; Thu, 7 Sep 2006 14:03:56 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 7 Sep 2006 14:03:56 GMT
Message-Id: <200609071403.k87E3uhC019246@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105791 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Sep 2006 14:22:47 -0000

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

Change 105791 by millert@millert_g5tower on 2006/09/07 14:03:21

	Fix boolean logic inversion that caused the blocking allocator
	to be used when we wanted the non-blocking one (and vice versa).

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#4 (text+ko) ====

@@ -274,7 +274,7 @@
 
 	    lck_mtx_unlock(so_cache_mtx);
 
-	    if (waitok)
+	    if (waitok == M_WAITOK)
 		 *so = (struct socket *) zalloc(so_cache_zone);
 	    else
 		 *so = (struct socket *) zalloc_noblock(so_cache_zone);