diff options
| author | dillon <dillon@FreeBSD.org> | 1999-02-01 08:49:30 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 1999-02-01 08:49:30 +0000 |
| commit | 56683bbe5aa9fcb495817b77bd9eec48a7103287 (patch) | |
| tree | c0aefc40e1199cf75edc2c66a473e2c9796d5b90 /sys/vm/vm_map.c | |
| parent | 823ec0275ed4a3394a3a91464bd6b4dd652df8b5 (diff) | |
| download | FreeBSD-src-56683bbe5aa9fcb495817b77bd9eec48a7103287.zip FreeBSD-src-56683bbe5aa9fcb495817b77bd9eec48a7103287.tar.gz | |
This patch eliminates a pointless test from appearing twice
in vm_map_simplify_entry. Basically, once you've verified that
the objects in the adjacent vm_map_entry's are the same, either
NULL or the same vm_object, there's no point in checking that the
objects have the same behavior.
Obtained from: Alan Cox <alc@cs.rice.edu>
Diffstat (limited to 'sys/vm/vm_map.c')
| -rw-r--r-- | sys/vm/vm_map.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 7bf7696..b656b5b 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.144 1999/01/28 00:57:57 dillon Exp $ + * $Id: vm_map.c,v 1.145 1999/01/31 14:09:25 julian Exp $ */ /* @@ -909,8 +909,6 @@ vm_map_simplify_entry(map, entry) if ( (prev->end == entry->start) && (prev->object.vm_object == entry->object.vm_object) && (!prev->object.vm_object || - (prev->object.vm_object->behavior == entry->object.vm_object->behavior)) && - (!prev->object.vm_object || (prev->offset + prevsize == entry->offset)) && (prev->eflags == entry->eflags) && (prev->protection == entry->protection) && @@ -935,8 +933,6 @@ vm_map_simplify_entry(map, entry) esize = entry->end - entry->start; if ((entry->end == next->start) && (next->object.vm_object == entry->object.vm_object) && - (!next->object.vm_object || - (next->object.vm_object->behavior == entry->object.vm_object->behavior)) && (!entry->object.vm_object || (entry->offset + esize == next->offset)) && (next->eflags == entry->eflags) && |
