svn commit: r207487 - head/sys/vm

[Alan Cox]

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);
 }