diff options
| author | dyson <dyson@FreeBSD.org> | 1997-01-03 17:02:28 +0000 |
|---|---|---|
| committer | dyson <dyson@FreeBSD.org> | 1997-01-03 17:02:28 +0000 |
| commit | b68b333a7752b79d0ec467fe5521768cbdf7d098 (patch) | |
| tree | 888a535485f9ec5a5266f90df84b606e163e1b7e /sys/vm/vm_object.c | |
| parent | 7b4778cf4f6e3158d1504ec162ddaf6ad066acce (diff) | |
| download | FreeBSD-src-b68b333a7752b79d0ec467fe5521768cbdf7d098.zip FreeBSD-src-b68b333a7752b79d0ec467fe5521768cbdf7d098.tar.gz | |
Undo the collapse breakage (swap space usage problem.)
Diffstat (limited to 'sys/vm/vm_object.c')
| -rw-r--r-- | sys/vm/vm_object.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index baa3761..1e5e2cf 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.82 1996/09/28 03:33:26 dyson Exp $ + * $Id: vm_object.c,v 1.84 1997/01/01 04:45:04 dyson Exp $ */ /* @@ -793,7 +793,6 @@ vm_object_shadow(object, offset, length) } -#if defined(OLD_COLLAPSE_CODE) /* * this version of collapse allows the operation to occur earlier and * when paging_in_progress is true for an object... This is not a complete @@ -861,7 +860,6 @@ vm_object_qcollapse(object) } backing_object->ref_count -= 2; } -#endif /* * vm_object_collapse: @@ -914,9 +912,7 @@ vm_object_collapse(object) if (object->paging_in_progress != 0 || backing_object->paging_in_progress != 0) { -#if defined(OLD_COLLAPSE_CODE) vm_object_qcollapse(object); -#endif return; } @@ -1292,12 +1288,10 @@ vm_object_coalesce(prev_object, prev_pindex, prev_size, next_size) return (FALSE); } -#if defined(OLD_COLLAPSE_CODE) /* * Try to collapse the object first */ vm_object_collapse(prev_object); -#endif /* * Can't coalesce if: . more than one reference . paged out . shadows |
