svn commit: r260645 - stable/8/sys/vm

[Xin LI]

Author: delphij
Date: Tue Jan 14 19:33:28 2014
New Revision: 260645
URL: http://svnweb.freebsd.org/changeset/base/260645

Log:
  MFC r259951 (kib):
  
  Do not coalesce stack entry. Pass MAP_STACK_GROWS_DOWN and
  MAP_STACK_GROWS_UP flags to vm_map_insert() from vm_map_stack()

Modified:
  stable/8/sys/vm/vm_map.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/vm/   (props changed)

Modified: stable/8/sys/vm/vm_map.c
==============================================================================
--- stable/8/sys/vm/vm_map.c	Tue Jan 14 19:27:42 2014	(r260644)
+++ stable/8/sys/vm/vm_map.c	Tue Jan 14 19:33:28 2014	(r260645)
@@ -1217,6 +1217,7 @@ charged:
 	}
 	else if ((prev_entry != &map->header) &&
 		 (prev_entry->eflags == protoeflags) &&
+		 (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
 		 (prev_entry->end == start) &&
 		 (prev_entry->wired_count == 0) &&
 		 (prev_entry->uip == uip ||
@@ -3189,7 +3190,6 @@ vm_map_stack(vm_map_t map, vm_offset_t a
 	 * NOTE: We explicitly allow bi-directional stacks.
 	 */
 	orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
-	cow &= ~orient;
 	KASSERT(orient != 0, ("No stack grow direction"));
 
 	if (addrbos < vm_map_min(map) ||