From owner-svn-src-all@FreeBSD.ORG  Sun May  2 01:25:03 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 78AD6106566B;
	Sun,  2 May 2010 01:25:03 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 692768FC12;
	Sun,  2 May 2010 01:25:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o421P3HY004273;
	Sun, 2 May 2010 01:25:03 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o421P3NS004271;
	Sun, 2 May 2010 01:25:03 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201005020125.o421P3NS004271@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 2 May 2010 01:25:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207487 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 02 May 2010 01:25:03 -0000

Author: alc
Date: Sun May  2 01:25:03 2010
New Revision: 207487
URL: http://svn.freebsd.org/changeset/base/207487

Log:
  Correct an error of omission in r206819.  If VMFS_TLB_ALIGNED_SPACE is
  specified to vm_map_find(), then retry the vm_map_findspace() if
  vm_map_insert() fails because the aligned space is already partly used.
  
  Reported by:	Neel Natu

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Sat May  1 23:25:53 2010	(r207486)
+++ head/sys/vm/vm_map.c	Sun May  2 01:25:03 2010	(r207487)
@@ -1412,7 +1412,11 @@ vm_map_find(vm_map_t map, vm_object_t ob
 		}
 		result = vm_map_insert(map, object, offset, start, start +
 		    length, prot, max, cow);
-	} while (result == KERN_NO_SPACE && find_space == VMFS_ALIGNED_SPACE);
+	} while (result == KERN_NO_SPACE && (find_space == VMFS_ALIGNED_SPACE
+#ifdef VMFS_TLB_ALIGNED_SPACE
+	    || find_space == VMFS_TLB_ALIGNED_SPACE
+#endif
+	    ));
 	vm_map_unlock(map);
 	return (result);
 }