svn commit: r260082 - stable/9/sys/vm

[Mathieu Arnold]

Hi,

Would you mind committing that on stable/8 too ? The bug must be there too.

+--On 30 décembre 2013 09:04:06 +0000 Konstantin Belousov
<kib at FreeBSD.org> wrote:
| Author: kib
| Date: Mon Dec 30 09:04:06 2013
| New Revision: 260082
| URL: http://svnweb.freebsd.org/changeset/base/260082
| 
| Log:
|   MFC r259951:
|   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/9/sys/vm/vm_map.c
| Directory Properties:
|   stable/9/sys/   (props changed)
| 
| Modified: stable/9/sys/vm/vm_map.c
| =========================================================================
| ===== --- stable/9/sys/vm/vm_map.c	Mon Dec 30 08:57:54 2013	(r260081)
| +++ stable/9/sys/vm/vm_map.c	Mon Dec 30 09:04:06 2013	(r260082)
| @@ -1230,6 +1230,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->cred == cred ||
| @@ -3341,7 +3342,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) ||
| _______________________________________________
| svn-src-all at freebsd.org mailing list
| http://lists.freebsd.org/mailman/listinfo/svn-src-all
| To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"
| 



-- 
Mathieu Arnold