diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-10-08 19:41:06 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-10-08 19:41:06 +0000 |
| commit | 2be3be2ddbafa45d11fc5c2bfd86d94328b5a99b (patch) | |
| tree | 972a4ae380b7663a918480e7217306ebd1c447bb /sys/arch/sh | |
| parent | 5b88d9a7ce49334eaf0f905b9db4cd275217edc2 (diff) | |
use access_type as the PROT_* variable for uvm_fault() consistantly
ok kettenis
Diffstat (limited to 'sys/arch/sh')
| -rw-r--r-- | sys/arch/sh/sh/trap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c index be252802363..b17b3effa85 100644 --- a/sys/arch/sh/sh/trap.c +++ b/sys/arch/sh/sh/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.44 2020/09/25 14:42:25 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.45 2020/10/08 19:41:05 deraadt Exp $ */ /* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */ /* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */ @@ -318,7 +318,7 @@ tlb_exception(struct proc *p, struct trapframe *tf, uint32_t va) pmap_t pmap; union sigval sv; int usermode; - int err, track, ftype; + int err, track, access_type; const char *panic_msg; #define TLB_ASSERT(assert, msg) \ @@ -348,15 +348,15 @@ tlb_exception(struct proc *p, struct trapframe *tf, uint32_t va) switch (tf->tf_expevt) { case EXPEVT_TLB_MISS_LD: track = PVH_REFERENCED; - ftype = PROT_READ; + access_type = PROT_READ; break; case EXPEVT_TLB_MISS_ST: track = PVH_REFERENCED; - ftype = PROT_WRITE; + access_type = PROT_WRITE; break; case EXPEVT_TLB_MOD: track = PVH_REFERENCED | PVH_MODIFIED; - ftype = PROT_WRITE; + access_type = PROT_WRITE; break; case EXPEVT_TLB_PROT_LD: TLB_ASSERT((int)va > 0, @@ -374,7 +374,7 @@ tlb_exception(struct proc *p, struct trapframe *tf, uint32_t va) case EXPEVT_TLB_PROT_ST: track = 0; /* call uvm_fault first. (COW) */ - ftype = PROT_WRITE; + access_type = PROT_WRITE; break; default: @@ -415,7 +415,7 @@ tlb_exception(struct proc *p, struct trapframe *tf, uint32_t va) return; } - err = uvm_fault(map, va, 0, ftype); + err = uvm_fault(map, va, 0, access_type); /* User stack extension */ if (map != kernel_map && |