[src/trunk]: src/sys/uvm/pmap s/pfi_faultpte/&p/ for consistency with arm / o...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42f7ad70f7a1
branches:  trunk
changeset: 960273:42f7ad70f7a1
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Mar 13 17:14:11 2021 +0000

description:
s/pfi_faultpte/&p/ for consistency with arm / other uses of ptep

diffstat:

 sys/arch/mips/include/pcb.h |   4 ++--
 sys/arch/mips/mips/trap.c   |  12 ++++++------
 sys/uvm/pmap/pmap.c         |   8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (103 lines):

diff -r fcab36cd528f -r 42f7ad70f7a1 sys/arch/mips/include/pcb.h
--- a/sys/arch/mips/include/pcb.h       Sat Mar 13 16:46:49 2021 +0000
+++ b/sys/arch/mips/include/pcb.h       Sat Mar 13 17:14:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcb.h,v 1.27 2020/09/26 04:31:53 simonb Exp $  */
+/*     $NetBSD: pcb.h,v 1.28 2021/03/13 17:14:11 skrll Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
 #include <mips/reg.h>
 
 struct pcb_faultinfo {
-       void *pfi_faultpte;
+       void *pfi_faultptep;
        vaddr_t pfi_faultaddr;
        u_int pfi_repeats;
        pid_t pfi_lastpid;
diff -r fcab36cd528f -r 42f7ad70f7a1 sys/arch/mips/mips/trap.c
--- a/sys/arch/mips/mips/trap.c Sat Mar 13 16:46:49 2021 +0000
+++ b/sys/arch/mips/mips/trap.c Sat Mar 13 17:14:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.257 2021/03/07 15:10:05 christos Exp $      */
+/*     $NetBSD: trap.c,v 1.258 2021/03/13 17:14:11 skrll Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.257 2021/03/07 15:10:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.258 2021/03/13 17:14:11 skrll Exp $");
 
 #include "opt_cputype.h"       /* which mips CPU levels do we support? */
 #include "opt_ddb.h"
@@ -383,7 +383,7 @@
                if (p->p_pid == pfi->pfi_lastpid && va == pfi->pfi_faultaddr) {
                        if (++pfi->pfi_repeats > 4) {
                                tlb_asid_t asid = tlb_get_asid();
-                               pt_entry_t *ptep = pfi->pfi_faultpte;
+                               pt_entry_t *ptep = pfi->pfi_faultptep;
                                printf("trap: fault #%u (%s/%s) for %#"
                                    PRIxVADDR" (%#"PRIxVADDR") at pc %#"
                                    PRIxVADDR" curpid=%u/%u ptep@%p=%#"
@@ -402,7 +402,7 @@
                        pfi->pfi_lastpid = p->p_pid;
                        pfi->pfi_faultaddr = va;
                        pfi->pfi_repeats = 0;
-                       pfi->pfi_faultpte = NULL;
+                       pfi->pfi_faultptep = NULL;
                        pfi->pfi_faulttype = TRAPTYPE(cause);
                }
 #endif /* PMAP_FAULTINFO */
@@ -435,10 +435,10 @@
                if (rv == 0) {
 #ifdef PMAP_FAULTINFO
                        if (pfi->pfi_repeats == 0) {
-                               pfi->pfi_faultpte =
+                               pfi->pfi_faultptep =
                                    pmap_pte_lookup(map->pmap, va);
                        }
-                       KASSERT(*(pt_entry_t *)pfi->pfi_faultpte);
+                       KASSERT(*(pt_entry_t *)pfi->pfi_faultptep);
 #endif
                        if (type & T_USER) {
                                userret(l);
diff -r fcab36cd528f -r 42f7ad70f7a1 sys/uvm/pmap/pmap.c
--- a/sys/uvm/pmap/pmap.c       Sat Mar 13 16:46:49 2021 +0000
+++ b/sys/uvm/pmap/pmap.c       Sat Mar 13 17:14:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.59 2021/03/13 15:29:13 skrll Exp $  */
+/*     $NetBSD: pmap.c,v 1.60 2021/03/13 17:14:11 skrll Exp $  */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.59 2021/03/13 15:29:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60 2021/03/13 17:14:11 skrll Exp $");
 
 /*
  *     Manages physical address maps.
@@ -1027,7 +1027,7 @@
 #ifdef PMAP_FAULTINFO
        curpcb->pcb_faultinfo.pfi_faultaddr = 0;
        curpcb->pcb_faultinfo.pfi_repeats = 0;
-       curpcb->pcb_faultinfo.pfi_faultpte = NULL;
+       curpcb->pcb_faultinfo.pfi_faultptep = NULL;
 #endif
        kpreempt_disable();
        pmap_addr_range_check(pmap, sva, eva, __func__);
@@ -1572,7 +1572,7 @@
 #ifdef PMAP_FAULTINFO
        curpcb->pcb_faultinfo.pfi_faultaddr = 0;
        curpcb->pcb_faultinfo.pfi_repeats = 0;
-       curpcb->pcb_faultinfo.pfi_faultpte = NULL;
+       curpcb->pcb_faultinfo.pfi_faultptep = NULL;
 #endif
        kpreempt_enable();