Date: Sun, 6 Jun 2021 20:45:14 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 317113bb1251 - main - riscv: Rename pmap_fault_fixup() to pmap_fault() Message-ID: <202106062045.156KjEhG052029@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=317113bb125166f6ba3035a29408339af38cca54 commit 317113bb125166f6ba3035a29408339af38cca54 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-06-06 20:42:00 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-06-06 20:44:46 +0000 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 MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D30645 --- sys/riscv/include/pmap.h | 2 +- sys/riscv/riscv/pmap.c | 2 +- sys/riscv/riscv/trap.c | 2 +- 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 747e75b765b2..50248ac79bf4 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 8297d4072a5c..07d7f84a94e8 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -226,7 +226,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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106062045.156KjEhG052029>