diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2018-11-13 17:43:16 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2018-11-13 17:43:16 +0000 |
| commit | 24d81f89d0ab0546226d1f22abc6cdc1b3b5f2e7 (patch) | |
| tree | 1a334d452edb3ab05261f714812e48878f25ab51 /sys/vm | |
| parent | 5323d309df1aab7e952957c232f58d8dd4147a6a (diff) | |
Notes
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 7a92301d3183..578bcd760071 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2143,8 +2143,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, next_size >>= PAGE_SHIFT; next_pindex = OFF_TO_IDX(prev_offset) + prev_size; - if ((prev_object->ref_count > 1) && - (prev_object->size != next_pindex)) { + if (prev_object->ref_count > 1 && + prev_object->size != next_pindex && + (prev_object->flags & OBJ_ONEMAPPING) == 0) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } |