X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Fmem%2Frmap.cc;fp=kernel%2Fmem%2Frmap.cc;h=dc9e2563efb23885d78eaec8c2cc424cb374b5a3;hp=2ef4a035b8ad7e5e61b1d62e7e5376f34ea7b8a8;hb=f95829cb521c076eebee345a1007e9fc912a0765;hpb=6ef00363db1c75274dfcc188c778cb437d896034 diff --git a/kernel/mem/rmap.cc b/kernel/mem/rmap.cc index 2ef4a03..dc9e256 100644 --- a/kernel/mem/rmap.cc +++ b/kernel/mem/rmap.cc @@ -28,7 +28,7 @@ namespace Mem { u64 dsvaddr, u64 usvaddr) { RMapNode *dsrmap = dsva->aspace->page_table-> - rmap_table.tree.lookup(dsvaddr, true); + rmap_table.lookup(dsvaddr, true); assert(!dsrmap->va); dsrmap->va = dsva; @@ -37,7 +37,7 @@ namespace Mem { dsrmap->tail.init(); if (usptbl) { - RMapNode *usrmap = usptbl->rmap_table.tree.lookup(usvaddr); + RMapNode *usrmap = usptbl->rmap_table.lookup(usvaddr); assert(usrmap); assert(usrmap->va->aspace->page_table == usptbl); @@ -53,7 +53,7 @@ namespace Mem { void RMapTable::unmap(u64 virtaddr) { Lock::AutoLock autolock(rmap_lock); - RMapNode *head = tree.lookup(virtaddr); + RMapNode *head = lookup(virtaddr); if (!head || !head->va) return; @@ -87,7 +87,7 @@ namespace Mem { void RMapTable::break_copy_on_write(u64 virtaddr, Page *new_page) { assert(rmap_lock.held_by_curthread()); - RMapNode *head = tree.lookup(virtaddr); + RMapNode *head = lookup(virtaddr); RMapNode *still_cow = NULL; assert(head && head->va);