Module Name: src
Committed By: skrll
Date: Sat Mar 13 17:14:12 UTC 2021
Modified Files:
src/sys/arch/mips/include: pcb.h
src/sys/arch/mips/mips: trap.c
src/sys/uvm/pmap: pmap.c
Log Message:
s/pfi_faultpte/&p/ for consistency with arm / other uses of ptep
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/include/pcb.h
cvs rdiff -u -r1.257 -r1.258 src/sys/arch/mips/mips/trap.c
cvs rdiff -u -r1.59 -r1.60 src/sys/uvm/pmap/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/pcb.h
diff -u src/sys/arch/mips/include/pcb.h:1.27 src/sys/arch/mips/include/pcb.h:1.28
--- src/sys/arch/mips/include/pcb.h:1.27 Sat Sep 26 04:31:53 2020
+++ src/sys/arch/mips/include/pcb.h Sat Mar 13 17:14:11 2021
@@ -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;
Index: src/sys/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.257 src/sys/arch/mips/mips/trap.c:1.258
--- src/sys/arch/mips/mips/trap.c:1.257 Sun Mar 7 15:10:05 2021
+++ src/sys/arch/mips/mips/trap.c Sat Mar 13 17:14:11 2021
@@ -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 @@ trap(uint32_t status, uint32_t cause, va
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 @@ trap(uint32_t status, uint32_t cause, va
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 @@ trap(uint32_t status, uint32_t cause, va
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);
Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.59 src/sys/uvm/pmap/pmap.c:1.60
--- src/sys/uvm/pmap/pmap.c:1.59 Sat Mar 13 15:29:13 2021
+++ src/sys/uvm/pmap/pmap.c Sat Mar 13 17:14:11 2021
@@ -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 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
#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 @@ pmap_remove_all(struct pmap *pmap)
#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();
