Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit rest of the previous (rbtree). 

(i should check .rej files before commit, sorry)
This commit is contained in:
yamt 2003-11-01 19:45:13 +00:00
parent 64f5a4d263
commit c45bf442f2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/uvm/uvm_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.c,v 1.144 2003/11/01 11:09:02 yamt Exp $ */
/* $NetBSD: uvm_map.c,v 1.145 2003/11/01 19:45:13 yamt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.144 2003/11/01 11:09:02 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.145 2003/11/01 19:45:13 yamt Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@ -891,6 +891,9 @@ uvm_map(struct vm_map *map, vaddr_t *startp /* IN/OUT */, vsize_t size,
prev_entry->end += size;
map->size += size;
uvm_rb_fixup(map, prev_entry);
uvm_tree_sanity(map, "map backmerged");
UVMHIST_LOG(maphist,"<- done (via backmerge)!", 0, 0, 0, 0);
if (new_entry) {
@ -1038,10 +1041,14 @@ forwardmerge:
} else {
prev_entry->next->start -= size;
map->size += size;
if (prev_entry != &map->header)
uvm_rb_fixup(map, prev_entry);
if (uobj)
prev_entry->next->offset = uoffset;
}
uvm_tree_sanity(map, "map forwardmerged");
UVMHIST_LOG(maphist,"<- done forwardmerge", 0, 0, 0, 0);
if (new_entry) {
uvm_mapent_free(new_entry);