diff options
| author | dyson <dyson@FreeBSD.org> | 1996-03-28 04:53:28 +0000 |
|---|---|---|
| committer | dyson <dyson@FreeBSD.org> | 1996-03-28 04:53:28 +0000 |
| commit | 903a66b4af563ab1d458c922fa4cbfc59d9cb018 (patch) | |
| tree | e0dca2fd627513ccae987c257604750551675787 /sys/vm/vm_object.c | |
| parent | f766c05521db606311b3b7fe35b927377d6cf400 (diff) | |
| download | FreeBSD-src-903a66b4af563ab1d458c922fa4cbfc59d9cb018.zip FreeBSD-src-903a66b4af563ab1d458c922fa4cbfc59d9cb018.tar.gz | |
VM performance improvements, and reorder some operations in VM fault
in anticipation of a fix in pmap that will allow the mlock system call to work
without panicing the system.
Diffstat (limited to 'sys/vm/vm_object.c')
| -rw-r--r-- | sys/vm/vm_object.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index df60eab..9512f89 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.64 1996/03/02 02:54:22 dyson Exp $ + * $Id: vm_object.c,v 1.65 1996/03/11 06:11:41 hsu Exp $ */ /* @@ -1257,6 +1257,10 @@ vm_object_coalesce(prev_object, prev_pindex, prev_size, next_size) return (TRUE); } + if (prev_object->type != OBJT_DEFAULT) { + return (FALSE); + } + /* * Try to collapse the object first */ @@ -1269,7 +1273,6 @@ vm_object_coalesce(prev_object, prev_pindex, prev_size, next_size) */ if (prev_object->ref_count > 1 || - prev_object->type != OBJT_DEFAULT || prev_object->backing_object != NULL) { return (FALSE); } |
