summaryrefslogtreecommitdiff
path: root/kernel/proc.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-07-24 15:28:37 -0400
committerRobert Morris <[email protected]>2019-07-24 15:28:37 -0400
commit9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4 (patch)
tree6007c6292c5d07144f3fa27be732fe27223a87d5 /kernel/proc.c
parentda898a11b61fd36e430ffd89b495dd5693c66e30 (diff)
downloadxv6-labs-9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4.tar.gz
xv6-labs-9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4.tar.bz2
xv6-labs-9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4.zip
rationalize some vm function names
Diffstat (limited to 'kernel/proc.c')
-rw-r--r--kernel/proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index 57cefe4..5136766 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -36,7 +36,7 @@ procinit(void)
if(pa == 0)
panic("kalloc");
uint64 va = KSTACK((int) (p - proc));
- kmap(va, (uint64)pa, PGSIZE, PTE_R | PTE_W);
+ kvmmap(va, (uint64)pa, PGSIZE, PTE_R | PTE_W);
p->kstack = va;
}
kvminithart();
@@ -173,8 +173,8 @@ proc_pagetable(struct proc *p)
void
proc_freepagetable(pagetable_t pagetable, uint64 sz)
{
- unmappages(pagetable, TRAMPOLINE, PGSIZE, 0);
- unmappages(pagetable, TRAPFRAME, PGSIZE, 0);
+ uvmunmap(pagetable, TRAMPOLINE, PGSIZE, 0);
+ uvmunmap(pagetable, TRAPFRAME, PGSIZE, 0);
if(sz > 0)
uvmfree(pagetable, sz);
}