Page MenuHomeFreeBSD

D17632.diff
No OneTemporary

D17632.diff

Index: head/sys/vm/vm_map.c
===================================================================
--- head/sys/vm/vm_map.c
+++ head/sys/vm/vm_map.c
@@ -1708,25 +1708,23 @@
return;
prev = entry->prev;
- if (prev != &map->header) {
- if (vm_map_mergeable_neighbors(prev, entry)) {
- vm_map_entry_unlink(map, prev);
- entry->start = prev->start;
- entry->offset = prev->offset;
- if (entry->prev != &map->header)
- vm_map_entry_resize_free(map, entry->prev);
- vm_map_merged_neighbor_dispose(map, prev);
- }
+ if (prev != &map->header &&
+ vm_map_mergeable_neighbors(prev, entry)) {
+ vm_map_entry_unlink(map, prev);
+ entry->start = prev->start;
+ entry->offset = prev->offset;
+ if (entry->prev != &map->header)
+ vm_map_entry_resize_free(map, entry->prev);
+ vm_map_merged_neighbor_dispose(map, prev);
}
next = entry->next;
- if (next != &map->header) {
- if (vm_map_mergeable_neighbors(entry, next)) {
- vm_map_entry_unlink(map, next);
- entry->end = next->end;
- vm_map_entry_resize_free(map, entry);
- vm_map_merged_neighbor_dispose(map, next);
- }
+ if (next != &map->header &&
+ vm_map_mergeable_neighbors(entry, next)) {
+ vm_map_entry_unlink(map, next);
+ entry->end = next->end;
+ vm_map_entry_resize_free(map, entry);
+ vm_map_merged_neighbor_dispose(map, next);
}
}
/*

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 4, 5:34 AM (21 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16448557
Default Alt Text
D17632.diff (1 KB)

Event Timeline