From owner-svn-src-all@FreeBSD.ORG  Mon Aug 11 13:12:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9F193192
 for <svn-src-all@freebsd.org>; Mon, 11 Aug 2014 13:12:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8FB4125CF
 for <svn-src-all@freebsd.org>; Mon, 11 Aug 2014 13:12:18 +0000 (UTC)
Received: from glebius (uid 1025) (envelope-from glebius@FreeBSD.org) id 23e6
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Mon, 11 Aug 2014 13:12:18 +0000
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 11 Aug 2014 13:12:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269808 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e8c132.23e6.34cb6102@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Aug 2014 13:12:18 -0000

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);