Author: markj
Date: Tue Oct 30 22:40:40 2018
New Revision: 339934
URL: https://svnweb.freebsd.org/changeset/base/339934
Log:
Revert r336984.
It appears to be responsible for random segfaults observed when lots
of paging activity is taking place, but the root cause is not yet
understood.
Requested by: alc
MFC after: now
Modified:
head/sys/vm/vm_object.c
Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c Tue Oct 30 21:35:56 2018 (r339933)
+++ head/sys/vm/vm_object.c Tue Oct 30 22:40:40 2018 (r339934)
@@ -2143,9 +2143,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset
next_size >>= PAGE_SHIFT;
next_pindex = OFF_TO_IDX(prev_offset) + prev_size;
- if (prev_object->ref_count > 1 &&
- prev_object->size != next_pindex &&
- (prev_object->flags & OBJ_ONEMAPPING) == 0) {
+ if ((prev_object->ref_count > 1) &&
+ (prev_object->size != next_pindex)) {
VM_OBJECT_WUNLOCK(prev_object);
return (FALSE);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
