aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-06-06 20:42:00 +0000
committerMark Johnston <markj@FreeBSD.org>2021-06-14 20:25:15 +0000
commit368b1cd57190757c5fbadd83ce002f7943a3e7ec (patch)
tree49f0e6818ed8a443834412906e8b71f7355aab3f
parentaa8280a90204c25a53851f8a68c6bdf2cb0111ef (diff)
downloadsrc-368b1cd57190757c5fbadd83ce002f7943a3e7ec.tar.gz
src-368b1cd57190757c5fbadd83ce002f7943a3e7ec.zip
riscv: Rename pmap_fault_fixup() to pmap_fault()
This is consistent with other platforms, specifically arm and arm64. No functional change intended. Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation (cherry picked from commit 317113bb125166f6ba3035a29408339af38cca54)
-rw-r--r--sys/riscv/include/pmap.h2
-rw-r--r--sys/riscv/riscv/pmap.c2
-rw-r--r--sys/riscv/riscv/trap.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h
index 9a1f23b20245..64b529e95887 100644
--- a/sys/riscv/include/pmap.h
+++ b/sys/riscv/include/pmap.h
@@ -160,7 +160,7 @@ void pmap_unmap_io_transient(vm_page_t *, vm_offset_t *, int, boolean_t);
bool pmap_get_tables(pmap_t, vm_offset_t, pd_entry_t **, pd_entry_t **,
pt_entry_t **);
-int pmap_fault_fixup(pmap_t, vm_offset_t, vm_prot_t);
+int pmap_fault(pmap_t, vm_offset_t, vm_prot_t);
static inline int
pmap_vmspace_copy(pmap_t dst_pmap __unused, pmap_t src_pmap __unused)
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
index 0f2834febd41..9761d97f449a 100644
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -2382,7 +2382,7 @@ retryl3:
}
int
-pmap_fault_fixup(pmap_t pmap, vm_offset_t va, vm_prot_t ftype)
+pmap_fault(pmap_t pmap, vm_offset_t va, vm_prot_t ftype)
{
pd_entry_t *l2, l2e;
pt_entry_t bits, *pte, oldpte;
diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
index 599fd64b56be..88c6adf5623b 100644
--- a/sys/riscv/riscv/trap.c
+++ b/sys/riscv/riscv/trap.c
@@ -228,7 +228,7 @@ page_fault_handler(struct trapframe *frame, int usermode)
ftype = VM_PROT_READ;
}
- if (pmap_fault_fixup(map->pmap, va, ftype))
+ if (pmap_fault(map->pmap, va, ftype))
goto done;
error = vm_fault_trap(map, va, ftype, VM_FAULT_NORMAL, &sig, &ucode);