svn commit: r269808 - head/sys/kern

Gleb Smirnoff glebius at FreeBSD.org
Mon Aug 11 13:12:18 UTC 2014


Author: glebius
Date: Mon Aug 11 13:12:18 2014
New Revision: 269808
URL: http://svnweb.freebsd.org/changeset/base/269808

Log:
  Use M_WAITOK in sf_buf_init().
  
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/kern/subr_sfbuf.c

Modified: head/sys/kern/subr_sfbuf.c
==============================================================================
--- head/sys/kern/subr_sfbuf.c	Mon Aug 11 12:59:55 2014	(r269807)
+++ head/sys/kern/subr_sfbuf.c	Mon Aug 11 13:12:18 2014	(r269808)
@@ -99,8 +99,7 @@ sf_buf_init(void *arg)
 	TAILQ_INIT(&sf_buf_freelist);
 	sf_base = kva_alloc(nsfbufs * PAGE_SIZE);
 	sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP,
-	    M_NOWAIT | M_ZERO);
-	KASSERT(sf_bufs, ("%s: malloc failure", __func__));
+	    M_WAITOK | M_ZERO);
 	for (i = 0; i < nsfbufs; i++) {
 		sf_bufs[i].kva = sf_base + i * PAGE_SIZE;
 		TAILQ_INSERT_TAIL(&sf_buf_freelist, &sf_bufs[i], free_entry);


More information about the svn-src-all mailing list