From b4b94df4093f6a9a89efd4cec350d8c63dcab622 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 15 May 2021 14:05:35 +0000 Subject: [PATCH] pmap_fault_fixup() does not need "int user" ok kettenis --- sys/arch/riscv64/include/pmap.h | 4 ++-- sys/arch/riscv64/riscv64/pmap.c | 4 ++-- sys/arch/riscv64/riscv64/trap.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arch/riscv64/include/pmap.h b/sys/arch/riscv64/include/pmap.h index ea03811f459..e9dbbbc915c 100644 --- a/sys/arch/riscv64/include/pmap.h +++ b/sys/arch/riscv64/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.4 2021/05/12 01:20:52 jsg Exp $ */ +/* $OpenBSD: pmap.h,v 1.5 2021/05/15 14:05:35 deraadt Exp $ */ /* * Copyright (c) 2019-2020 Brian Bamsch @@ -110,7 +110,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); #endif /* _KERNEL && !_LOCORE */ diff --git a/sys/arch/riscv64/riscv64/pmap.c b/sys/arch/riscv64/riscv64/pmap.c index 797b5c90b88..312c96e5bd5 100644 --- a/sys/arch/riscv64/riscv64/pmap.c +++ b/sys/arch/riscv64/riscv64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.9 2021/05/14 06:48:52 jsg Exp $ */ +/* $OpenBSD: pmap.c,v 1.10 2021/05/15 14:05:35 deraadt Exp $ */ /* * Copyright (c) 2019-2020 Brian Bamsch @@ -1709,7 +1709,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/riscv64/riscv64/trap.c b/sys/arch/riscv64/riscv64/trap.c index 372884d17ac..67b7482ca6a 100644 --- a/sys/arch/riscv64/riscv64/trap.c +++ b/sys/arch/riscv64/riscv64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.9 2021/05/14 06:48:52 jsg Exp $ */ +/* $OpenBSD: trap.c,v 1.10 2021/05/15 14:05:36 deraadt Exp $ */ /* * Copyright (c) 2020 Shivam Waghela @@ -237,7 +237,7 @@ data_abort(struct trapframe *frame, int usermode) map = &p->p_vmspace->vm_map; } - if (pmap_fault_fixup(map->pmap, va, ftype, usermode)) + if (pmap_fault_fixup(map->pmap, va, ftype)) goto done; KERNEL_LOCK(); -- 2.20.1