svn commit: r264565 - head/sys/kern

[Navdeep Parhar]

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)