diff options
| author | Robert Morris <rtm@csail.mit.edu> | 2019-07-26 04:53:59 -0400 | 
|---|---|---|
| committer | Robert Morris <rtm@csail.mit.edu> | 2019-07-26 04:53:59 -0400 | 
| commit | 8d30e21b59d2f6d48e593cd6c2399d0743971155 (patch) | |
| tree | 6e069363f4841813a5c2af0455375fe3f0090ff3 /kernel | |
| parent | ea95a6654c3f921849f3541aa856a8806ebf571e (diff) | |
| parent | 0358ee912bb37439d36a76ca4469aaa1ab6c2a48 (diff) | |
| download | xv6-labs-8d30e21b59d2f6d48e593cd6c2399d0743971155.tar.gz xv6-labs-8d30e21b59d2f6d48e593cd6c2399d0743971155.tar.bz2 xv6-labs-8d30e21b59d2f6d48e593cd6c2399d0743971155.zip | |
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/vm.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/kernel/vm.c b/kernel/vm.c index a1c36ba..3631c9c 100644 --- a/kernel/vm.c +++ b/kernel/vm.c @@ -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;  } | 
