Date: Tue, 31 Dec 2013 08:02:35 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r260122 - releng/10.0/sys/vm Message-ID: <201312310802.rBV82Zf3077850@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Dec 31 08:02:34 2013 New Revision: 260122 URL: http://svnweb.freebsd.org/changeset/base/260122 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() Approved by: re (delphij) Modified: releng/10.0/sys/vm/vm_map.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/vm/vm_map.c ============================================================================== --- releng/10.0/sys/vm/vm_map.c Tue Dec 31 07:36:39 2013 (r260121) +++ releng/10.0/sys/vm/vm_map.c Tue Dec 31 08:02:34 2013 (r260122) @@ -1207,6 +1207,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 || @@ -3316,7 +3317,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) ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312310802.rBV82Zf3077850>