From owner-svn-src-head@FreeBSD.ORG  Wed Apr 16 21:39:43 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 C06E4B46;
 Wed, 16 Apr 2014 21:39:43 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE022144B;
 Wed, 16 Apr 2014 21:39:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GLdhgF051397;
 Wed, 16 Apr 2014 21:39:43 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GLdh5T051396;
 Wed, 16 Apr 2014 21:39:43 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201404162139.s3GLdh5T051396@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Wed, 16 Apr 2014 21:39:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264565 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Apr 2014 21:39:43 -0000

Author: np
Date: Wed Apr 16 21:39:43 2014
New Revision: 264565
URL: http://svnweb.freebsd.org/changeset/base/264565

Log:
  Do not set M_BESTFIT if a strategy has already been provided.  This
  fixes problems when using M_FIRSTFIT.
  
  Reviewed by:	jeff@
  MFC after:	1 week

Modified:
  head/sys/kern/subr_vmem.c

Modified: head/sys/kern/subr_vmem.c
==============================================================================
--- head/sys/kern/subr_vmem.c	Wed Apr 16 21:30:17 2014	(r264564)
+++ head/sys/kern/subr_vmem.c	Wed Apr 16 21:39:43 2014	(r264565)
@@ -502,7 +502,8 @@ qc_import(void *arg, void **store, int c
 	int i;
 
 	qc = arg;
-	flags |= M_BESTFIT;
+	if ((flags & VMEM_FITMASK) == 0)
+		flags |= M_BESTFIT;
 	for (i = 0; i < cnt; i++) {
 		if (vmem_xalloc(qc->qc_vmem, qc->qc_size, 0, 0, 0,
 		    VMEM_ADDR_MIN, VMEM_ADDR_MAX, flags, &addr) != 0)