zap some typedefs.

vm_map_t -> struct vm_map *
vm_map_entry_t -> struct vm_map_entry *
simple_lock_data_t -> struct simplelock

(uvm not done yet, coming in the next commit)

5 files changed, 16 insertions, 16 deletions

diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c
index 724c7c67d1f..25b1e7a0422 100644
--- a/sys/arch/mvme88k/dev/if_ie.c
+++ b/sys/arch/mvme88k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.15 2001/11/06 19:53:15 miod Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.16 2001/11/28 16:13:28 art Exp $ */
 
 /*-
  * Copyright (c) 1998 Steve Murphree, Jr. 
@@ -141,7 +141,7 @@ Mode of operation:
 #include <machine/board.h>
 
 static struct mbuf *last_not_for_us;
-vm_map_t ie_map; /* for obio */
+struct vm_map *ie_map; /* for obio */
 
 #define	IED_RINT	0x01
 #define	IED_TINT	0x02
diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h
index b36f85a395c..4c156a1a76c 100644
--- a/sys/arch/mvme88k/include/pmap.h
+++ b/sys/arch/mvme88k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.18 2001/11/28 15:34:16 art Exp $ */
+/*	$OpenBSD: pmap.h,v 1.19 2001/11/28 16:13:28 art Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -31,7 +31,7 @@ struct pmap {
     sdt_ptr_t		sdt_paddr;	/* physical pointer to sdt */
     sdt_ptr_t		sdt_vaddr;	/* virtual pointer to sdt */
     int			ref_count;	/* reference count */
-    simple_lock_data_t	lock;
+    struct simplelock	lock;
     struct pmap_statistics stats;	/* pmap statistics */
     
     /* cpus using of this pmap; NCPU must be <= 32 */
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 0aef05dcc80..eed11ba7ecd 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.67 2001/11/28 13:57:18 art Exp $	*/
+/* $OpenBSD: machdep.c,v 1.68 2001/11/28 16:13:29 art Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -192,9 +192,9 @@ int longformat = 1;  /* for regdump() */
  */
 int   safepri = PSR_SUPERVISOR;
 
-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;
 
 /*
  * iomap stuff is for managing chunks of virtual address space that
@@ -206,7 +206,7 @@ vm_map_t phys_map = NULL;
 vaddr_t iomapbase;
 
 struct extent *iomap_extent;
-vm_map_t   iomap_map;
+struct vm_map *iomap_map;
 
 /*
  * Declare these as initialized data so we can patch them.
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index f91611face1..0aac5bca96e 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.26 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.27 2001/11/28 16:13:29 art Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -190,7 +190,7 @@ trap18x(unsigned type, struct m88100_saved_state *frame)
 {
 	struct proc *p;
 	u_quad_t sticks = 0;
-	vm_map_t map;
+	struct vm_map *map;
 	vm_offset_t va;
 	vm_prot_t ftype;
 	int fault_type;
@@ -202,7 +202,7 @@ trap18x(unsigned type, struct m88100_saved_state *frame)
 	int sig = 0;
 	unsigned pc = PC_REGS(frame);  /* get program counter (sxip) */
 
-	extern vm_map_t kernel_map;
+	extern struct vm_map *kernel_map;
 	extern unsigned guarded_access_start;
 	extern unsigned guarded_access_end;
 	extern unsigned guarded_access_bad;
@@ -683,7 +683,7 @@ trap197(unsigned type, struct m88100_saved_state *frame)
 {
 	struct proc *p;
 	u_quad_t sticks = 0;
-	vm_map_t map;
+	struct vm_map *map;
 	vm_offset_t va;
 	vm_prot_t ftype;
 	int fault_type;
@@ -696,7 +696,7 @@ trap197(unsigned type, struct m88100_saved_state *frame)
 	unsigned pc = PC_REGS(frame);  /* get program counter (sxip) */
 	unsigned user = 0, write = 0, data = 0;
 
-	extern vm_map_t kernel_map;
+	extern struct vm_map *kernel_map;
 	extern unsigned guarded_access_start;
 	extern unsigned guarded_access_end;
 
diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c
index df432f9a8e6..8cff090213c 100644
--- a/sys/arch/mvme88k/mvme88k/vm_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.39 2001/11/27 05:37:02 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.40 2001/11/28 16:13:29 art Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -68,7 +68,7 @@
 #include <machine/trap.h>
 
 extern struct extent *iomap_extent;
-extern vm_map_t   iomap_map;
+extern struct vm_map *iomap_map;
 
 vm_offset_t iomap_mapin __P((vm_offset_t, vm_size_t, boolean_t));
 void iomap_mapout __P((vm_offset_t, vm_size_t));