From owner-svn-src-projects@FreeBSD.ORG  Mon Dec  9 23:59:17 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 19B55BFA;
 Mon,  9 Dec 2013 23:59:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 046621D3D;
 Mon,  9 Dec 2013 23:59:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9NxGSk051014;
 Mon, 9 Dec 2013 23:59:16 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9NxGB3051013;
 Mon, 9 Dec 2013 23:59:16 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201312092359.rB9NxGB3051013@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 9 Dec 2013 23:59:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r259149 - projects/altix2/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Dec 2013 23:59:17 -0000

Author: marcel
Date: Mon Dec  9 23:59:16 2013
New Revision: 259149
URL: http://svnweb.freebsd.org/changeset/base/259149

Log:
  Call kmem_alloc_contig() with M_NOWAIT for now. This needs to come from
  the user of the busdma_mem_alloc() interface, but that needs a bit of
  review.

Modified:
  projects/altix2/sys/kern/subr_busdma.c

Modified: projects/altix2/sys/kern/subr_busdma.c
==============================================================================
--- projects/altix2/sys/kern/subr_busdma.c	Mon Dec  9 23:58:26 2013	(r259148)
+++ projects/altix2/sys/kern/subr_busdma.c	Mon Dec  9 23:59:16 2013	(r259149)
@@ -1026,6 +1026,7 @@ busdma_mem_alloc(struct busdma_tag *tag,
 
 	md->md_flags = mtag.dmt_flags;
 	mflags = (flags & BUSDMA_ALLOC_ZERO) ? M_ZERO : 0;
+	mflags |= M_NOWAIT;
 
 	idx = 0;
 	maxsz = tag->dt_maxsz;