From c7a3775adf220abbced441c40a07ad7117233a36 Mon Sep 17 00:00:00 2001
From: Navdeep Parhar <np@FreeBSD.org>
Date: Wed, 16 Apr 2014 21:39:43 +0000
Subject: [PATCH] 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
---
 sys/kern/subr_vmem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c
index 3b70738389b..d9eaadae78c 100644
--- a/sys/kern/subr_vmem.c
+++ b/sys/kern/subr_vmem.c
@@ -502,7 +502,8 @@ qc_import(void *arg, void **store, int cnt, int flags)
 	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)