diff options
Diffstat (limited to 'sys/arch/amiga')
| -rw-r--r-- | sys/arch/amiga/amiga/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/amiga/amiga/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/amiga/amiga/trap.c | 12 | ||||
| -rw-r--r-- | sys/arch/amiga/include/pmap.h | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c index 6d725642d17..60ffa1c7ff7 100644 --- a/sys/arch/amiga/amiga/machdep.c +++ b/sys/arch/amiga/amiga/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.60 2001/11/28 13:57:18 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.61 2001/11/28 16:13:27 art Exp $ */ /* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */ /* @@ -129,9 +129,9 @@ void fdintr __P((int)); */ u_int16_t amiga_ttyspl = PSL_S|PSL_IPL4; -vm_map_t exec_map = NULL; -vm_map_t mb_map = NULL; -vm_map_t phys_map = NULL; +struct vm_map *exec_map = NULL; +struct vm_map *mb_map = NULL; +struct vm_map *phys_map = NULL; /* * Declare these as initialized data so we can patch them. diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c index 890721b785e..ae2ba83ece2 100644 --- a/sys/arch/amiga/amiga/pmap.c +++ b/sys/arch/amiga/amiga/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.41 2001/11/28 15:34:16 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.42 2001/11/28 16:13:27 art Exp $ */ /* $NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $ */ /*- @@ -271,7 +271,7 @@ u_int *Segtabzero, *Segtabzeropa; vsize_t Sysptsize = VM_KERNEL_PT_PAGES; struct pmap kernel_pmap_store; -vm_map_t pt_map; +struct vm_map *pt_map; struct vm_map pt_map_store; vsize_t mem_size; /* memory size in bytes */ diff --git a/sys/arch/amiga/amiga/trap.c b/sys/arch/amiga/amiga/trap.c index 3251e315940..0198f1bc79b 100644 --- a/sys/arch/amiga/amiga/trap.c +++ b/sys/arch/amiga/amiga/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.27 2001/11/28 13:47:37 art Exp $ */ +/* $OpenBSD: trap.c,v 1.28 2001/11/28 16:13:27 art Exp $ */ /* $NetBSD: trap.c,v 1.56 1997/07/16 00:01:47 is Exp $ */ /* @@ -180,7 +180,7 @@ extern char fubail[], subail[]; /* XXX until we get it from m68k/cpu.h */ extern void regdump __P((struct trapframe *, int)); -int _write_back __P((u_int, u_int, u_int, u_int, vm_map_t)); +int _write_back __P((u_int, u_int, u_int, u_int, struct vm_map *)); void panictrap __P((int, u_int, u_int, struct frame *)); void trapcpfault __P((struct proc *, struct frame *)); void trapmmufault __P((int, u_int, u_int, struct frame *, struct proc *, @@ -282,11 +282,11 @@ trapmmufault(type, code, v, fp, p, sticks) static u_int oldcode=0, oldv=0; static struct proc *oldp=0; #endif - extern vm_map_t kernel_map; + extern struct vm_map *kernel_map; struct vmspace *vm = NULL; vm_prot_t ftype, vftype; vm_offset_t va; - vm_map_t map; + struct vm_map *map; u_int nss; int rv; union sigval sv; @@ -444,7 +444,7 @@ trapmmufault(type, code, v, fp, p, sticks) /* Check WB3 */ if(fp->f_fmt7.f_wb3s & WBS_VALID) { - vm_map_t wb3_map; + struct vm_map *wb3_map; if ((fp->f_fmt7.f_wb3s & WBS_TMMASK) == WBS_TM_SDATA) wb3_map = kernel_map; @@ -951,7 +951,7 @@ _write_back (wb, wb_sts, wb_data, wb_addr, wb_map) u_int wb_sts; /* writeback status information */ u_int wb_data; /* data to writeback */ u_int wb_addr; /* address to writeback to */ - vm_map_t wb_map; + struct vm_map *wb_map; { u_int wb_extra_page = 0; u_int wb_rc, mmusr; diff --git a/sys/arch/amiga/include/pmap.h b/sys/arch/amiga/include/pmap.h index b673d385e9d..ee360b407db 100644 --- a/sys/arch/amiga/include/pmap.h +++ b/sys/arch/amiga/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.8 2001/11/28 15:34:16 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.9 2001/11/28 16:13:28 art Exp $ */ /* $NetBSD: pmap.h,v 1.17 1997/06/10 18:34:52 veego Exp $ */ /* @@ -54,7 +54,7 @@ struct pmap { short pm_sref; /* segment table ref count */ short pm_count; /* pmap reference count */ long pm_ptpages; /* more stats: PT pages */ - simple_lock_data_t pm_lock; /* lock on pmap */ + struct simplelock pm_lock; /* lock on pmap */ struct pmap_statistics pm_stats; /* pmap statistics */ }; |