PERFORCE change 137345 for review

[Steve Wise]

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

Change 137345 by swise at 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);