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)

49 files changed, 170 insertions, 170 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 39d8906520b..ab12c4c4a4b 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.59 2001/11/28 13:47:37 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.60 2001/11/28 16:13:27 art Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -149,9 +149,9 @@ int	bufpages = BUFPAGES;
 int	bufpages = 0;
 #endif
 
-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;
 
 int	maxmem;			/* max memory per process */
 
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index 4100a183fe1..1adc97860b9 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.28 2001/11/28 13:47:37 art Exp $ */
+/* $OpenBSD: trap.c,v 1.29 2001/11/28 16:13:27 art Exp $ */
 /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
 
 /*-
@@ -434,12 +434,12 @@ trap(a0, a1, a2, entry, framep)
 		case ALPHA_MMCSR_INVALTRANS:
 		case ALPHA_MMCSR_ACCESS:
 	    	{
-			register vaddr_t va;
-			register struct vmspace *vm = NULL;
-			register vm_map_t map;
+			vaddr_t va;
+			struct vmspace *vm = NULL;
+			struct vm_map *map;
 			vm_prot_t ftype;
 			int rv;
-			extern vm_map_t kernel_map;
+			extern struct vm_map *kernel_map;
 
 			/*
 			 * If it was caused by fuswintr or suswintr,
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 */
 };
 
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 29a268861c9..212001c3fbf 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.70 2001/11/28 13:57:18 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.71 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $	*/
 
 /*
@@ -110,9 +110,9 @@
 /* the following is used externally (sysctl_hw) */
 char	machine[] = MACHINE;	/* from <machine/param.h> */
 
-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;
 
 extern paddr_t avail_start, avail_end;
 
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c
index afda3f82a79..5b8f1becea2 100644
--- a/sys/arch/hp300/hp300/pmap.c
+++ b/sys/arch/hp300/hp300/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.34 2001/11/28 14:13:06 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.35 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.80 1999/09/16 14:52:06 chs Exp $	*/
 
 /*-
@@ -246,7 +246,7 @@ st_entry_t	*Segtabzero, *Segtabzeropa;
 vsize_t		Sysptsize = VM_KERNEL_PT_PAGES;
 
 struct pmap	kernel_pmap_store;
-vm_map_t	st_map, pt_map;
+struct vm_map	*st_map, *pt_map;
 struct vm_map	st_map_store, pt_map_store;
 
 paddr_t		avail_start;	/* PA of first available physical page */
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index 6744ada3853..8a0d4489249 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.33 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.34 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $	*/
 
 /*
@@ -601,10 +601,10 @@ dopanic:
 	    {
 		vaddr_t va;
 		struct vmspace *vm = p->p_vmspace;
-		vm_map_t map;
+		struct vm_map *map;
 		int rv;
 		vm_prot_t ftype, vftype;
-		extern vm_map_t kernel_map;
+		extern struct vm_map *kernel_map;
 
 #ifdef DEBUG
 		if ((mmudebug & MDB_WBFOLLOW) || MDB_ISPID(p->p_pid))
diff --git a/sys/arch/hp300/include/pmap.h b/sys/arch/hp300/include/pmap.h
index d08446a488f..3d427d92af3 100644
--- a/sys/arch/hp300/include/pmap.h
+++ b/sys/arch/hp300/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.9 2001/11/27 22:05:32 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.10 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.13 1997/06/10 18:58:19 veego Exp $	*/
 
 /* 
@@ -67,7 +67,7 @@ struct pmap {
 	st_entry_t		*pm_stpa;	/* 040: ST phys addr */
 	short			pm_sref;	/* segment table ref count */
 	short			pm_count;	/* pmap reference count */
-	simple_lock_data_t	pm_lock;	/* lock on pmap */
+	struct simplelock	pm_lock;	/* lock on pmap */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	long			pm_ptpages;	/* more stats: PT pages */
 };
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index bb2694b1198..4800d76c7b5 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.45 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.46 2001/11/28 16:13:28 art Exp $	*/
 
 /*
  * Copyright (c) 1999-2000 Michael Shalayeff
@@ -165,9 +165,9 @@ struct user *proc0paddr;
 long mem_ex_storage[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
 struct extent *hppa_ex;
 
-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;
 
 
 void delay_init __P((void));
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index 59edd5bcd7e..db781270c7c 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.33 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.34 2001/11/28 16:13:28 art Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Michael Shalayeff
@@ -141,8 +141,8 @@ trap(type, frame)
 {
 	struct proc *p = curproc;
 	struct pcb *pcbp;
-	register vaddr_t va;
-	register vm_map_t map;
+	vaddr_t va;
+	struct vm_map *map;
 	struct vmspace *vm;
 	register vm_prot_t vftype;
 	register pa_space_t space;
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 169a2a58be3..2c3fb637e37 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.185 2001/11/28 15:02:58 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.186 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -242,9 +242,9 @@ int	i386_fpu_fdivbug;
 bootarg_t *bootargp;
 vm_offset_t avail_end;
 
-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;
 
 int kbd_reset;
 
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 2e99c633ee8..2572addfa68 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.50 2001/11/28 15:02:58 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.51 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -268,11 +268,11 @@
 #endif
 
 struct lock pmap_main_lock;
-simple_lock_data_t pvalloc_lock;
-simple_lock_data_t pmaps_lock;
-simple_lock_data_t pmap_copy_page_lock;
-simple_lock_data_t pmap_zero_page_lock;
-simple_lock_data_t pmap_tmpptp_lock;
+struct simplelock pvalloc_lock;
+struct simplelock pmaps_lock;
+struct simplelock pmap_copy_page_lock;
+struct simplelock pmap_zero_page_lock;
+struct simplelock pmap_tmpptp_lock;
 
 #define PMAP_MAP_TO_HEAD_LOCK() \
      spinlockmgr(&pmap_main_lock, LK_SHARED, (void *) 0)
@@ -1406,7 +1406,7 @@ pmap_free_pvpage()
 {
 	int s;
 	struct vm_map *map;
-	vm_map_entry_t dead_entries;
+	struct vm_map_entry *dead_entries;
 	struct pv_page *pvp;
 
 	s = splimp(); /* protect kmem_map */
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index 508a4a26088..6aa7063898c 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.16 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.17 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $	*/
 
 /*-
@@ -70,7 +70,7 @@
 #include <machine/vm86.h>
 #endif
 
-extern vm_map_t kernel_map;
+extern struct vm_map *kernel_map;
 
 #ifdef USER_LDT
 int i386_get_ldt __P((struct proc *, void *, register_t *));
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 98580fd7259..391f6e6b233 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.45 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.46 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -416,11 +416,11 @@ trap(frame)
 		/* FALLTHROUGH */
 
 	case T_PAGEFLT|T_USER: {	/* page fault */
-		register vm_offset_t va;
-		register struct vmspace *vm = p->p_vmspace;
-		register vm_map_t map;
+		vm_offset_t va;
+		struct vmspace *vm = p->p_vmspace;
+		struct vm_map *map;
 		int rv;
-		extern vm_map_t kernel_map;
+		extern struct vm_map *kernel_map;
 		unsigned nss;
 
 		if (vm == NULL)
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index c024a60a4e8..eb179fb4e2a 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.19 2001/11/28 15:02:58 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.20 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $	*/
 
 /*
@@ -291,7 +291,7 @@ struct pmap {
 struct pv_entry;
 
 struct pv_head {
-	simple_lock_data_t pvh_lock;	/* locks every pv on this list */
+	struct simplelock pvh_lock;	/* locks every pv on this list */
 	struct pv_entry *pvh_list;	/* head of list (locked by pvh_lock) */
 };
 
diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h
index a97797e63ab..4f0e0c248bf 100644
--- a/sys/arch/mac68k/include/pmap.h
+++ b/sys/arch/mac68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.11 2001/11/28 15:34:16 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.12 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.26 1999/07/21 03:18:21 briggs Exp $	*/
 
 /*
@@ -100,7 +100,7 @@ struct pmap {
 	st_entry_t		*pm_stpa;	/* 040: ST phys addr */
 	short			pm_sref;	/* segment table ref count */
 	short			pm_count;	/* pmap reference count */
-	simple_lock_data_t	pm_lock;	/* lock on pmap */
+	struct simplelock	pm_lock;	/* lock on pmap */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	long			pm_ptpages;	/* more stats: PT pages */
 };
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 642712037c1..fcbd4a32b20 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.89 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.90 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $	*/
 
 /*
@@ -180,9 +180,9 @@ u_int32_t mac68k_vidlen;	/* mem length */
 int	(*mac68k_bell_callback) __P((void *, int, int, int));
 caddr_t	mac68k_bell_cookie;
 
-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/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index 6ee13f34d0e..423bf175bba 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.34 2001/11/28 15:34:16 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.35 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.55 1999/04/22 04:24:53 chs Exp $	*/
 
 /*
@@ -209,7 +209,7 @@ st_entry_t	*Segtabzero, *Segtabzeropa;
 vsize_t		Sysptsize = VM_KERNEL_PT_PAGES;
 
 struct pmap	kernel_pmap_store;
-vm_map_t	st_map, pt_map;
+struct vm_map	*st_map, *pt_map;
 struct vm_map	st_map_store, pt_map_store;
 
 paddr_t		avail_start;	/* PA of first available physical page */
@@ -2313,7 +2313,7 @@ pmap_check_wiring(str, va)
 	char *str;
 	vaddr_t va;
 {
-	vm_map_entry_t entry;
+	struct vm_map_entry *entry;
 	int count;
 	pt_entry_t *pte;
 
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index d2a1a125409..521aee4568f 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.32 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.33 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $	*/
 
 /*
@@ -570,10 +570,10 @@ copyfault:
 	    {
 		vaddr_t va;
 		struct vmspace *vm = p->p_vmspace;
-		vm_map_t map;
+		struct vm_map *map;
 		int rv;
 		vm_prot_t ftype, vftype;
-		extern vm_map_t kernel_map;
+		extern struct vm_map *kernel_map;
 
 #ifdef DEBUG
 		if ((mmudebug & MDB_WBFOLLOW) || MDB_ISPID(p->p_pid))
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index a97eb2621f2..e4f8fecdc67 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.16 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.17 2001/11/28 16:13:28 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -122,9 +122,9 @@ int bufpages = 0;
 
 struct bat battable[16];
 
-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;
 
 int astpending;
 int ppc_malloc_ok = 0;
diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c
index 5e8d289a2ef..81bb9908036 100644
--- a/sys/arch/mvme68k/dev/if_ie.c
+++ b/sys/arch/mvme68k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.16 2001/11/06 19:53:15 miod Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.17 2001/11/28 16:13:28 art Exp $ */
 
 /*-
  * Copyright (c) 1999 Steve Murphree, Jr. 
@@ -148,7 +148,7 @@ Mode of operation:
 #include <mvme68k/dev/i82596.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/mvme68k/include/pmap.h b/sys/arch/mvme68k/include/pmap.h
index 95a17d2336f..0291e2bd484 100644
--- a/sys/arch/mvme68k/include/pmap.h
+++ b/sys/arch/mvme68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.7 2001/11/28 15:34:16 art Exp $ */
+/*	$OpenBSD: pmap.h,v 1.8 2001/11/28 16:13:28 art Exp $ */
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -64,7 +64,7 @@ struct pmap {
 	st_entry_t		*pm_stpa;	/* 040: ST phys addr */
 	short			pm_sref;	/* segment table ref count */
 	short			pm_count;	/* pmap reference count */
-	simple_lock_data_t	pm_lock;	/* lock on pmap */
+	struct simplelock	pm_lock;	/* lock on pmap */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	long			pm_ptpages;	/* more stats: PT pages */
 };
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 5f5b3389e2c..dae807eac36 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.58 2001/11/28 13:57:18 art Exp $ */
+/*	$OpenBSD: machdep.c,v 1.59 2001/11/28 16:13:28 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -124,9 +124,9 @@
 /* the following is used externally (sysctl_hw) */
 char machine[] = "mvme68k";		/* cpu "architecture" */
 
-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;
 
 extern vm_offset_t avail_end;
 
diff --git a/sys/arch/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c
index d4742b91d2d..1bc234640da 100644
--- a/sys/arch/mvme68k/mvme68k/pmap.c
+++ b/sys/arch/mvme68k/mvme68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.33 2001/11/28 15:34:16 art Exp $ */
+/*	$OpenBSD: pmap.c,v 1.34 2001/11/28 16:13:28 art Exp $ */
 
 /* 
  * Copyright (c) 1995 Theo de Raadt
@@ -235,7 +235,7 @@ st_entry_t	*Segtabzero, *Segtabzeropa;
 vm_size_t	Sysptsize = VM_KERNEL_PT_PAGES;
 
 struct pmap	kernel_pmap_store;
-vm_map_t	st_map, pt_map;
+struct vm_map	*st_map, *pt_map;
 struct vm_map	st_map_store, pt_map_store;
 
 vm_offset_t    	avail_start;	/* PA of first available physical page */
@@ -2366,7 +2366,7 @@ pmap_check_wiring(str, va)
 	char *str;
 	vm_offset_t va;
 {
-	vm_map_entry_t entry;
+	struct vm_map_entry *entry;
 	register int count;
 	register pt_entry_t *pte;
 
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 456c7a83efb..5e8424b24ab 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.39 2001/11/28 13:47:38 art Exp $ */
+/*	$OpenBSD: trap.c,v 1.40 2001/11/28 16:13:28 art Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -535,12 +535,12 @@ copyfault:
 
 	case T_MMUFLT|T_USER:	/* page fault */
 		{
-			register vm_offset_t va;
-			register struct vmspace *vm = NULL;
-			register vm_map_t map;
+			vm_offset_t va;
+			struct vmspace *vm = NULL;
+			struct vm_map *map;
 			int rv;
 			vm_prot_t ftype, vftype;
-			extern vm_map_t kernel_map;
+			extern struct vm_map *kernel_map;
 
 			/* vmspace only significant if T_USER */
 			if (p)
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));
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index 893c9dcd0ff..98d4ddc2623 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.15 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.16 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -133,9 +133,9 @@ int bufpages = 0;
 
 struct bat battable[16];
 
-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;
 
 int astpending;
 int ppc_malloc_ok = 0;
diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c
index 51d8d951118..88a596408a9 100644
--- a/sys/arch/powerpc/powerpc/trap.c
+++ b/sys/arch/powerpc/powerpc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.39 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.40 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $	*/
 
 /*
@@ -270,7 +270,7 @@ trap(frame)
 
 	case EXC_DSI:
 		{
-			vm_map_t map;
+			struct vm_map *map;
 			vm_offset_t va;
 			int ftype;
 			faultbuf *fb;
diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c
index e059db4b290..d55da16983f 100644
--- a/sys/arch/sparc/dev/if_ie.c
+++ b/sys/arch/sparc/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.19 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.20 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $	*/
 
 /*-
@@ -153,7 +153,7 @@ Mode of operation:
 #include <sparc/dev/i82586.h>
 
 static struct mbuf *last_not_for_us;
-vm_map_t ie_map; /* for obio */
+struct struct vm_map *ie_map; /* for obio */
 
 #define	IED_RINT	0x01
 #define	IED_TINT	0x02
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 8f1a7991c25..e6259a6632a 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.72 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.73 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -110,9 +110,9 @@
 #include "led.h"
 #endif
 
-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/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h
index 25fbee6dbed..1cbdc0cb6da 100644
--- a/sys/arch/sun3/include/pmap.h
+++ b/sys/arch/sun3/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.10 2001/11/28 15:34:17 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.11 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.18 1997/01/27 19:41:06 gwr Exp $	*/
 
 /*-
@@ -46,7 +46,7 @@
 
 struct pmap {
 	int	                pm_refcount;	/* pmap reference count */
-	simple_lock_data_t      pm_lock;	/* lock on pmap */
+	struct simplelock	pm_lock;	/* lock on pmap */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	int                     pm_version;
 	int                     pm_ctxnum;
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 7979000eba5..5d3a40c7ffb 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.45 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.46 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $	*/
 
 /*
@@ -102,9 +102,9 @@ int fputype;
 label_t *nofault;
 vm_offset_t vmmap;
 
-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;
 
 /*
  * safepri is a safe priority for sleep to set for a spin-wait
diff --git a/sys/arch/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c
index 23b43ba8a6f..4ff91c75db8 100644
--- a/sys/arch/sun3/sun3/trap.c
+++ b/sys/arch/sun3/sun3/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.30 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.31 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: trap.c,v 1.63-1.65ish 1997/01/16 15:41:40 gwr Exp $	*/
 
 /*
@@ -451,12 +451,12 @@ trap(type, code, v, frame)
 		/*FALLTHROUGH*/
 
 	case T_MMUFLT|T_USER: { 	/* page fault */
-		register vm_offset_t va;
-		register struct vmspace *vm = NULL;
-		register vm_map_t map;
+		vm_offset_t va;
+		struct vmspace *vm = NULL;
+		struct vm_map *map;
 		int rv;
 		vm_prot_t ftype, vftype;
-		extern vm_map_t kernel_map;
+		extern struct vm_map *kernel_map;
 
 		/* vmspace only significant if T_USER */
 		if (p)
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index f7ff70c87a6..71ab2b0f336 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.46 2001/11/28 13:47:39 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.47 2001/11/28 16:13:29 art Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $	 */
 
 /*
@@ -154,9 +154,9 @@ int		cold = 1; /* coldstart */
 #define	IOMAPSZ	100
 static	struct map iomap[IOMAPSZ];
 
-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;
 
 #ifdef DEBUG
 int iospace_inited = 0;
diff --git a/sys/arch/vax/vax/trap.c b/sys/arch/vax/vax/trap.c
index 3de7399f7ee..94a27d5228d 100644
--- a/sys/arch/vax/vax/trap.c
+++ b/sys/arch/vax/vax/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.19 2001/11/28 13:47:39 art Exp $     */
+/*	$OpenBSD: trap.c,v 1.20 2001/11/28 16:13:29 art Exp $     */
 /*	$NetBSD: trap.c,v 1.47 1999/08/21 19:26:20 matt Exp $     */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -145,7 +145,7 @@ arithflt(frame)
 	u_int	rv, addr, umode;
 	struct	proc *p = curproc;
 	u_quad_t oticks = 0;
-	vm_map_t map;
+	struct vm_map *map;
 	vm_prot_t ftype;
 	int typ;
 	union sigval sv;
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index c869a2794de..2e0c91da53b 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_break.c,v 1.10 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_break.c,v 1.11 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $	*/
 
 /* 
@@ -81,7 +81,7 @@ db_breakpoint_free(bkpt)
 
 void
 db_set_breakpoint(map, addr, count)
-	vm_map_t	map;
+	struct vm_map  *map;
 	db_addr_t	addr;
 	int		count;
 {
@@ -117,7 +117,7 @@ db_set_breakpoint(map, addr, count)
 
 void
 db_delete_breakpoint(map, addr)
-	vm_map_t	map;
+	struct vm_map  *map;
 	db_addr_t	addr;
 {
 	register db_breakpoint_t	bkpt;
@@ -142,7 +142,7 @@ db_delete_breakpoint(map, addr)
 
 db_breakpoint_t
 db_find_breakpoint(map, addr)
-	vm_map_t	map;
+	struct vm_map  *map;
 	db_addr_t	addr;
 {
 	register db_breakpoint_t	bkpt;
@@ -320,7 +320,7 @@ db_listbreak_cmd(addr, have_addr, count, modif)
 
 boolean_t
 db_map_equal(map1, map2)
-	vm_map_t	map1, map2;
+	struct vm_map *map1, *map2;
 {
 	return ((map1 == map2) ||
 		((map1 == NULL) && (map2 == kernel_map)) ||
@@ -329,7 +329,7 @@ db_map_equal(map1, map2)
 
 boolean_t
 db_map_current(map)
-	vm_map_t	map;
+	struct vm_map *map;
 {
 #if 0
 	thread_t	thread;
@@ -343,7 +343,7 @@ db_map_current(map)
 #endif
 }
 
-vm_map_t
+struct vm_map *
 db_map_addr(addr)
 	vaddr_t addr;
 {
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 5be78bd0dd3..717df231112 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_break.h,v 1.6 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_break.h,v 1.7 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: db_break.h,v 1.8 1996/02/05 01:56:52 christos Exp $	*/
 
 /* 
@@ -39,7 +39,7 @@
  * Breakpoints.
  */
 typedef struct db_breakpoint {
-	vm_map_t map;			/* in this map */
+	struct vm_map *map;			/* in this map */
 	db_addr_t address;		/* set here */
 	int	init_count;		/* number of times to skip bkpt */
 	int	count;			/* current count */
@@ -52,9 +52,9 @@ typedef struct db_breakpoint {
 
 db_breakpoint_t db_breakpoint_alloc __P((void));
 void db_breakpoint_free __P((db_breakpoint_t));
-void db_set_breakpoint __P((vm_map_t, db_addr_t, int));
-void db_delete_breakpoint __P((vm_map_t, db_addr_t));
-db_breakpoint_t db_find_breakpoint __P((vm_map_t, db_addr_t));
+void db_set_breakpoint __P((struct vm_map *, db_addr_t, int));
+void db_delete_breakpoint __P((struct vm_map *, db_addr_t));
+db_breakpoint_t db_find_breakpoint __P((struct vm_map *, db_addr_t));
 db_breakpoint_t db_find_breakpoint_here __P((db_addr_t));
 void db_set_breakpoints __P((void));
 void db_clear_breakpoints __P((void));
@@ -64,8 +64,8 @@ void db_list_breakpoints __P((void));
 void db_delete_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_breakpoint_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_listbreak_cmd __P((db_expr_t, int, db_expr_t, char *));
-boolean_t db_map_equal __P((vm_map_t, vm_map_t));
-boolean_t db_map_current __P((vm_map_t));
-vm_map_t db_map_addr __P((vaddr_t));
+boolean_t db_map_equal __P((struct vm_map *, struct vm_map *));
+boolean_t db_map_current __P((struct vm_map *));
+struct vm_map *db_map_addr __P((vaddr_t));
 
 #endif	/* _DDB_DB_BREAK_H_ */
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index ff2428c6b90..3f88d110a24 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_command.c,v 1.23 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_command.c,v 1.24 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $	*/
 
 /* 
@@ -290,7 +290,7 @@ db_map_print_cmd(addr, have_addr, count, modif)
         if (modif[0] == 'f')
                 full = TRUE;
 
-        uvm_map_printit((vm_map_t) addr, full, db_printf);
+        uvm_map_printit((struct vm_map *) addr, full, db_printf);
 }
 /*ARGSUSED*/
 void
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 8ab65d803ff..c350d245fa8 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_watch.c,v 1.5 1999/09/11 00:44:59 mickey Exp $ */
+/*	$OpenBSD: db_watch.c,v 1.6 2001/11/28 16:13:29 art Exp $ */
 /*	$NetBSD: db_watch.c,v 1.9 1996/03/30 22:30:12 christos Exp $	*/
 
 /* 
@@ -86,7 +86,7 @@ db_watchpoint_free(watch)
 
 void
 db_set_watchpoint(map, addr, size)
-	vm_map_t	map;
+	struct vm_map	*map;
 	db_addr_t	addr;
 	vsize_t 	size;
 {
@@ -129,7 +129,7 @@ db_set_watchpoint(map, addr, size)
 
 void
 db_delete_watchpoint(map, addr)
-	vm_map_t	map;
+	struct vm_map	*map;
 	db_addr_t	addr;
 {
 	register db_watchpoint_t	watch;
@@ -240,7 +240,7 @@ db_clear_watchpoints()
 
 boolean_t
 db_find_watchpoint(map, addr, regs)
-	vm_map_t	map;
+	struct vm_map	*map;
 	db_addr_t	addr;
 	db_regs_t	*regs;
 {
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 132d9c74a00..4e4981e2812 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_watch.h,v 1.6 1999/09/11 00:44:59 mickey Exp $	*/
+/*	$OpenBSD: db_watch.h,v 1.7 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: db_watch.h,v 1.9 1996/02/05 01:57:24 christos Exp $	*/
 
 /* 
@@ -37,7 +37,7 @@
  * Watchpoint.
  */
 typedef struct db_watchpoint {
-	vm_map_t map;			/* in this map */
+	struct vm_map *map;		/* in this map */
 	db_addr_t loaddr;		/* from this address */
 	db_addr_t hiaddr;		/* to this address */
 	struct db_watchpoint *link;	/* link in in-use or free chain */
@@ -45,14 +45,14 @@ typedef struct db_watchpoint {
 
 db_watchpoint_t db_watchpoint_alloc __P((void));
 void db_watchpoint_free __P((db_watchpoint_t));
-void db_set_watchpoint __P((vm_map_t, db_addr_t, vsize_t));
-void db_delete_watchpoint __P((vm_map_t, db_addr_t));
+void db_set_watchpoint __P((struct vm_map *, db_addr_t, vsize_t));
+void db_delete_watchpoint __P((struct vm_map *, db_addr_t));
 void db_list_watchpoints __P((void));
 void db_deletewatch_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_watchpoint_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_listwatch_cmd __P((db_expr_t, int, db_expr_t, char *));
 void db_set_watchpoints __P((void));
 void db_clear_watchpoints __P((void));
-boolean_t db_find_watchpoint __P((vm_map_t, db_addr_t, db_regs_t *));
+boolean_t db_find_watchpoint __P((struct vm_map *, db_addr_t, db_regs_t *));
 
 #endif	/* _DDB_DB_WATCH_ */
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 511a4f96176..c958ddb8c70 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccd.c,v 1.45 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: ccd.c,v 1.46 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $	*/
 
 /*-
@@ -199,7 +199,7 @@ struct	ccddevice *ccddevs;
 int	numccd = 0;
 
 /* A separate map so that locking on kernel_map won't happen in interrupts */
-static vm_map_t ccdmap;
+static struct vm_map *ccdmap;
 
 /*
  * Set when a process need some kvm.
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 69354571140..1b84c19fb82 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_malloc.c,v 1.40 2001/11/06 19:53:20 miod Exp $	*/
+/*	$OpenBSD: kern_malloc.c,v 1.41 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $	*/
 
 /*
@@ -47,7 +47,7 @@
 #include <uvm/uvm_extern.h>
 
 static struct vm_map_intrsafe kmem_map_store;
-vm_map_t kmem_map = NULL;
+struct vm_map *kmem_map = NULL;
 
 int nkmempages;
 
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 2553a1661cd..7eadb5d2dce 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.42 2001/11/06 19:53:20 miod Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.43 2001/11/28 16:13:29 art Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 struct	pool mbpool;		/* mbuf pool */
 struct	pool mclpool;		/* mbuf cluster pool */
 
-extern	vm_map_t mb_map;
+extern	struct vm_map *mb_map;
 int	needqueuedrain;
 
 void	*mclpool_alloc __P((unsigned long, int, int));