From owner-p4-projects@FreeBSD.ORG  Thu Oct 20 20:37:58 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 466B316A421; Thu, 20 Oct 2005 20:37:58 +0000 (GMT)
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 E65DA16A41F
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:37:57 +0000 (GMT)
	(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 A10C043D66
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:37:57 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9KKbvcY024435
	for <perforce@freebsd.org>; Thu, 20 Oct 2005 20:37:57 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9KKbvGZ024432
	for perforce@freebsd.org; Thu, 20 Oct 2005 20:37:57 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 20 Oct 2005 20:37:57 GMT
Message-Id: <200510202037.j9KKbvGZ024432@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 85618 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 20 Oct 2005 20:37:59 -0000

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

Change 85618 by millert@millert_ibook on 2005/10/20 20:37:16

	Honor M_NOWAIT in sebsd_malloc() by calling kalloc_noblock()
	instead of kalloc().

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#10 (text+ko) ====

@@ -81,8 +81,9 @@
 {
 	void *v;
 
-	v = (void *)kalloc(size);
-	if (flags & M_ZERO)
+	v = (flags & M_NOWAIT) ?
+	    (void *)kalloc_noblock(size) : (void *)kalloc(size);
+	if (v != NULL && (flags & M_ZERO))
 		bzero(v, size);
 	return (v);
 }