diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-07-16 03:12:31 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-07-16 03:12:31 +0200 |
| commit | 61b1134df944eee5188214a9e249101f1ec095e7 (patch) | |
| tree | c5546a458f2b238e3737589df8a8d6f0c68c5be3 | |
| parent | 03499e53ccf8391c5b5d4b9eca096abe5e9312c3 (diff) | |
| parent | e7e6f4fc9061190720b7a67adfff49f2546843aa (diff) | |
merge
| -rw-r--r-- | sys/src/9/pc64/mmu.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/src/9/pc64/mmu.c b/sys/src/9/pc64/mmu.c index 58663a9f1..936955d4b 100644 --- a/sys/src/9/pc64/mmu.c +++ b/sys/src/9/pc64/mmu.c @@ -517,12 +517,17 @@ putmmu(uintptr va, uintptr pa, Page *) void checkmmu(uintptr va, uintptr pa) { - uintptr *pte; + uintptr *pte, old; + int x; + x = splhi(); pte = mmuwalk(m->pml4, va, 0, 0); - if(pte != 0 && (*pte & PTEVALID) != 0 && PPN(*pte) != pa) - print("%ld %s: va=%#p pa=%#p pte=%#p\n", - up->pid, up->text, va, pa, *pte); + if(pte == 0 || ((old = *pte) & PTEVALID) == 0 || PPN(old) == pa){ + splx(x); + return; + } + splx(x); + print("%ld %s: va=%#p pa=%#p pte=%#p\n", up->pid, up->text, va, pa, old); } uintptr |