From owner-p4-projects@FreeBSD.ORG  Mon Mar 10 20:24:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AFD7A1065718; Mon, 10 Mar 2008 20:24:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3DF8F1065670
	for <perforce@FreeBSD.org>; Mon, 10 Mar 2008 20:24:01 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D0558FC29
	for <perforce@FreeBSD.org>; Mon, 10 Mar 2008 20:24:01 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKO13p039152
	for <perforce@FreeBSD.org>; Mon, 10 Mar 2008 20:24:01 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKO1BJ039150
	for perforce@freebsd.org; Mon, 10 Mar 2008 20:24:01 GMT
	(envelope-from swise@FreeBSD.org)
Date: Mon, 10 Mar 2008 20:24:01 GMT
Message-Id: <200803102024.m2AKO1BJ039150@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise <swise@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 137345 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: Mon, 10 Mar 2008 20:24:02 -0000

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

Change 137345 by swise@swise:vic10:iwarp on 2008/03/10 20:23:49

	Don't use WAITOK.

Affected files ...

.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#15 edit

Differences ...

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#15 (text+ko) ====

@@ -341,7 +341,7 @@
 	struct mtutab mtutab;
 	unsigned int l2t_capacity;
 
-	t = malloc(sizeof(*t), M_CXGB, M_WAITOK|M_ZERO);
+	t = malloc(sizeof(*t), M_CXGB, M_NOWAIT|M_ZERO);
 	if (!t)
 		return (ENOMEM);
 	dev->adapter = adapter;
@@ -1358,7 +1358,7 @@
 	t->rx_page_size = rx_page_info.page_size;
 	/* OK if this fails, we just can't do DDP */
 	t->nppods = (ddp.ulimit + 1 - ddp.llimit) / PPOD_SIZE;
-	t->ppod_map = malloc(t->nppods, M_DEVBUF, M_WAITOK|M_ZERO);
+	t->ppod_map = malloc(t->nppods, M_DEVBUF, M_NOWAIT|M_ZERO);
 
 	mtx_init(&t->ppod_map_lock, "ppod map", NULL, MTX_DEF);