Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv

This commit is contained in:
Robert Morris 2019-07-26 04:53:59 -04:00
commit 8d30e21b59
3 changed files with 250 additions and 10 deletions

View file

@ -133,9 +133,9 @@ kvmpa(uint64 va)
pte = walk(kernel_pagetable, va, 0);
if(pte == 0)
panic("kernelpa");
panic("kvmpa");
if((*pte & PTE_V) == 0)
panic("kernelpa");
panic("kvmpa");
pa = PTE2PA(*pte);
return pa+off;
}
@ -343,7 +343,7 @@ uvmclear(pagetable_t pagetable, uint64 va)
pte = walk(pagetable, va, 0);
if(pte == 0)
panic("clearpteu");
panic("uvmclear");
*pte &= ~PTE_U;
}