jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-01 21:33:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix some serious errors in vm_map_simplify_entries.

Browse Source
This commit is contained in:
John Dyson 1996-06-12 04:03:21 +00:00
parent d02dcfb382
commit 5fcf66debe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=16318
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/vm/vm_map.c
View File

@ -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.48 1996/05/29 05:12:21 dyson Exp $
* $Id: vm_map.c,v 1.49 1996/05/31 00:37:58 dyson Exp $
*/
/*
@ -861,8 +861,9 @@ vm_map_simplify_entry(map, entry)
prevsize = prev->end - prev->start;
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->offset + prevsize == entry->offset) &&
(prev->object.vm_object || (prev->object.vm_object->behavior == entry->object.vm_object->behavior)) &&
(!prev->object.vm_object ||
(prev->offset + prevsize == entry->offset)) &&
(prev->needs_copy == entry->needs_copy) &&
(prev->copy_on_write == entry->copy_on_write) &&
(prev->protection == entry->protection) &&
@ -890,8 +891,9 @@ 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->offset + esize == next->offset) &&
(next->object.vm_object || (next->object.vm_object->behavior == entry->object.vm_object->behavior)) &&
(!entry->object.vm_object ||
(entry->offset + esize == next->offset)) &&
(next->needs_copy == entry->needs_copy) &&
(next->copy_on_write == entry->copy_on_write) &&
(next->protection == entry->protection) &&
@ -912,7 +914,6 @@ vm_map_simplify_entry(map, entry)
}
}
}
/*
* vm_map_clip_start: [ internal use only ]
*