From e423a3a2761e17fb01665862e3f430a13e8ea83e Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Wed, 5 Mar 1997 16:45:01 +0000
Subject: Try a no-wait malloc first in clist_alloc_cblocks().  If this fails,
 then complain and blunder on.

Should be in 2.2, preferably with a better fix.
---
 sys/kern/subr_clist.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'sys/kern/subr_clist.c')

diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 7203e02..24091f6 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
  */
 
 /*
@@ -131,7 +131,12 @@ cblock_alloc_cblocks(number)
 	struct cblock *cbp;
 
 	for (i = 0; i < number; ++i) {
-		cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
+		cbp = malloc(sizeof *cbp, M_TTYS, M_NOWAIT);
+		if (cbp == NULL) {
+			printf(
+"clist_alloc_cblocks: M_NOWAIT malloc failed, trying M_WAITOK\n");
+			cbp = malloc(sizeof *cbp, M_TTYS, M_WAITOK);
+		}
 		/*
 		 * Freed cblocks have zero quotes and garbage elsewhere.
 		 * Set the may-have-quote bit to force zeroing the quotes.
-- 
cgit v1.1