diff options
| author | kib <kib@FreeBSD.org> | 2013-12-30 08:57:54 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-12-30 08:57:54 +0000 |
| commit | cc03f8b1e531c18884ae8fa13066b66edc14aa8f (patch) | |
| tree | 90cbcd2c80a429d7c3bd03ff8e07142debb7b92e /sys/vm/vm_map.c | |
| parent | fc0cf4002785ad6522bbca2fe8b339ec492e7c17 (diff) | |
| download | FreeBSD-src-cc03f8b1e531c18884ae8fa13066b66edc14aa8f.zip FreeBSD-src-cc03f8b1e531c18884ae8fa13066b66edc14aa8f.tar.gz | |
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()
Diffstat (limited to 'sys/vm/vm_map.c')
| -rw-r--r-- | sys/vm/vm_map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index e3842a3..e15e0ca 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -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 || @@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * 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) || |
