Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill the last use of vm_fault_t, from Havard Eidnes

Browse Source
This commit is contained in:
drochner 2006-03-20 13:14:37 +00:00
parent 90b0b10c77
commit 86225028d1
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/mips/mips/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.199 2006/03/15 18:12:02 drochner Exp $ */
/* $NetBSD: trap.c,v 1.200 2006/03/20 13:14:37 drochner Exp $ */
/*
* Copyright (c) 1992, 1993
@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.199 2006/03/15 18:12:02 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.200 2006/03/20 13:14:37 drochner Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ktrace.h"
@ -379,7 +379,7 @@ trap(unsigned status, unsigned cause, unsigned vaddr, unsigned opc,
}
if (p->p_emul->e_fault)
rv = (*p->p_emul->e_fault)(p, va, 0, ftype);
rv = (*p->p_emul->e_fault)(p, va, ftype);
else
rv = uvm_fault(map, va, ftype);
#ifdef VMFAULT_TRACE

11
sys/compat/irix/irix_prctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_prctl.c,v 1.28 2005/12/11 12:20:12 christos Exp $ */
/* $NetBSD: irix_prctl.c,v 1.29 2006/03/20 13:14:37 drochner Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: irix_prctl.c,v 1.28 2005/12/11 12:20:12 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: irix_prctl.c,v 1.29 2006/03/20 13:14:37 drochner Exp $");
#include <sys/errno.h>
#include <sys/types.h>
@ -705,10 +705,9 @@ irix_prda_init(p)
}
int
irix_vm_fault(p, vaddr, fault_type, access_type)
irix_vm_fault(p, vaddr, access_type)
struct proc *p;
vaddr_t vaddr;
vm_fault_t fault_type;
vm_prot_t access_type;
{
int error;
@ -719,11 +718,11 @@ irix_vm_fault(p, vaddr, fault_type, access_type)
map = &p->p_vmspace->vm_map;
if (ied->ied_share_group == NULL || ied->ied_shareaddr == 0)
return uvm_fault(map, vaddr, fault_type, access_type);
return uvm_fault(map, vaddr, access_type);
/* share group version */
(void)lockmgr(&ied->ied_share_group->isg_lock, LK_EXCLUSIVE, NULL);
error = uvm_fault(map, vaddr, fault_type, access_type);
error = uvm_fault(map, vaddr, access_type);
irix_vm_sync(p);
(void)lockmgr(&ied->ied_share_group->isg_lock, LK_RELEASE, NULL);

4
sys/compat/irix/irix_prctl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_prctl.h,v 1.10 2005/12/11 12:20:12 christos Exp $ */
/* $NetBSD: irix_prctl.h,v 1.11 2006/03/20 13:14:37 drochner Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@ struct irix_shared_regions_rec {
int irix_prda_init __P((struct proc *));
void irix_vm_sync __P((struct proc *));
int irix_vm_fault __P((struct proc *, vaddr_t, vm_fault_t, vm_prot_t));
int irix_vm_fault __P((struct proc *, vaddr_t, vm_prot_t));
void irix_isrr_insert __P((vaddr_t, vsize_t, int, struct proc *));
/* macro used to wrap irix_vm_sync calls */

4
sys/sys/proc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: proc.h,v 1.216 2006/03/07 03:32:06 thorpej Exp $ */
/* $NetBSD: proc.h,v 1.217 2006/03/20 13:14:37 drochner Exp $ */
/*-
* Copyright (c) 1986, 1989, 1991, 1993
@ -125,7 +125,7 @@ struct emul {
#endif
/* Emulation specific sysctl data */
struct sysctlnode *e_sysctlovly;
int (*e_fault)(struct proc *, vaddr_t, int, int);
int (*e_fault)(struct proc *, vaddr_t, int);
vaddr_t (*e_vm_default_addr)(struct proc *, vaddr_t, vsize_t);