summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/vm/vm_object.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 9dea3a1..8683e2f 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -2099,8 +2099,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
if (prev_object == NULL)
return (TRUE);
VM_OBJECT_WLOCK(prev_object);
- if (prev_object->type != OBJT_DEFAULT &&
- prev_object->type != OBJT_SWAP) {
+ if ((prev_object->type != OBJT_DEFAULT &&
+ prev_object->type != OBJT_SWAP) ||
+ (prev_object->flags & OBJ_TMPFS) != 0) {
VM_OBJECT_WUNLOCK(prev_object);
return (FALSE);
}
OpenPOWER on IntegriCloud