diff options
Diffstat (limited to 'sys/arch/arm64')
| -rw-r--r-- | sys/arch/arm64/arm64/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/arm64/trap.c | 6 | ||||
| -rw-r--r-- | sys/arch/arm64/include/pmap.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/arm64/arm64/pmap.c b/sys/arch/arm64/arm64/pmap.c index e7b33cc2c6b..c2adf3c2348 100644 --- a/sys/arch/arm64/arm64/pmap.c +++ b/sys/arch/arm64/arm64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.67 2019/12/19 17:53:27 mpi Exp $ */ +/* $OpenBSD: pmap.c,v 1.68 2020/10/21 21:53:45 deraadt Exp $ */ /* * Copyright (c) 2008-2009,2014-2016 Dale Rahn <drahn@dalerahn.com> * @@ -1695,7 +1695,7 @@ pmap_pte_remove(struct pte_desc *pted, int remove_pted) * for this emulation, or to tell the caller that it's a legit fault. */ int -pmap_fault_fixup(pmap_t pm, vaddr_t va, vm_prot_t ftype, int user) +pmap_fault_fixup(pmap_t pm, vaddr_t va, vm_prot_t ftype) { struct pte_desc *pted; struct vm_page *pg; diff --git a/sys/arch/arm64/arm64/trap.c b/sys/arch/arm64/arm64/trap.c index 093d4c30980..eddf33e342f 100644 --- a/sys/arch/arm64/arm64/trap.c +++ b/sys/arch/arm64/arm64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.32 2020/10/08 19:41:04 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.33 2020/10/21 21:53:45 deraadt Exp $ */ /*- * Copyright (c) 2014 Andrew Turner * All rights reserved. @@ -138,7 +138,7 @@ data_abort(struct trapframe *frame, uint64_t esr, uint64_t far, if (map != kernel_map) { /* Fault in the user page: */ - if (!pmap_fault_fixup(map->pmap, va, access_type, 1)) { + if (!pmap_fault_fixup(map->pmap, va, access_type)) { KERNEL_LOCK(); error = uvm_fault(map, va, 0, access_type); if (error == 0) @@ -150,7 +150,7 @@ data_abort(struct trapframe *frame, uint64_t esr, uint64_t far, * Don't have to worry about process locking or stacks in the * kernel. */ - if (!pmap_fault_fixup(map->pmap, va, access_type, 0)) { + if (!pmap_fault_fixup(map->pmap, va, access_type)) { KERNEL_LOCK(); error = uvm_fault(map, va, 0, access_type); KERNEL_UNLOCK(); diff --git a/sys/arch/arm64/include/pmap.h b/sys/arch/arm64/include/pmap.h index bf12dbc001c..f3747e600d4 100644 --- a/sys/arch/arm64/include/pmap.h +++ b/sys/arch/arm64/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.13 2019/06/04 14:07:22 patrick Exp $ */ +/* $OpenBSD: pmap.h,v 1.14 2020/10/21 21:53:47 deraadt Exp $ */ /* * Copyright (c) 2008,2009,2014 Dale Rahn <drahn@dalerahn.com> * @@ -106,7 +106,7 @@ struct pv_entry; /* investigate */ #define pmap_unuse_final(p) do { /* nothing */ } while (0) -int pmap_fault_fixup(pmap_t, vaddr_t, vm_prot_t, int); +int pmap_fault_fixup(pmap_t, vaddr_t, vm_prot_t); void pmap_postinit(void); void pmap_map_early(paddr_t, psize_t); |