From 12d512bbb7b55c90ccfd7ad325ba5df5d2d302c9 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Sat, 27 Mar 1999 00:30:06 +0000
Subject: [PATCH] Oops; vm_offset_t -> vaddr_t.

---
 sys/arch/atari/atari/mem.c     | 4 ++--
 sys/arch/hp300/hp300/mem.c     | 4 ++--
 sys/arch/i386/i386/mem.c       | 4 ++--
 sys/arch/mac68k/mac68k/mem.c   | 4 ++--
 sys/arch/mvme68k/mvme68k/mem.c | 4 ++--
 sys/arch/next68k/next68k/mem.c | 4 ++--
 sys/arch/pc532/pc532/mem.c     | 4 ++--
 sys/arch/sparc/sparc/mem.c     | 4 ++--
 sys/arch/sparc64/sparc64/mem.c | 4 ++--
 sys/arch/sun3/sun3/mem.c       | 7 ++++---
 sys/arch/sun3/sun3x/mem.c      | 7 ++++---
 sys/arch/x68k/x68k/mem.c       | 4 ++--
 12 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/sys/arch/atari/atari/mem.c b/sys/arch/atari/atari/mem.c
index d13bbcd1a855..5a0660327f05 100644
--- a/sys/arch/atari/atari/mem.c
+++ b/sys/arch/atari/atari/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.14 1999/03/26 23:41:28 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.15 1999/03/27 00:30:06 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -145,7 +145,7 @@ mmrw(dev, uio, flags)
 
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/hp300/hp300/mem.c b/sys/arch/hp300/hp300/mem.c
index 4bd1f1cb7c3f..7c38da388f6e 100644
--- a/sys/arch/hp300/hp300/mem.c
+++ b/sys/arch/hp300/hp300/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.24 1999/03/26 23:41:29 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -137,7 +137,7 @@ mmrw(dev, uio, flags)
 
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index b6c6ecfa1682..97f31310a470 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.40 1999/03/26 23:41:30 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.41 1999/03/27 00:30:07 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -143,7 +143,7 @@ mmrw(dev, uio, flags)
 			v = uio->uio_offset;
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c
index ac04e5f42229..ec92a77739a4 100644
--- a/sys/arch/mac68k/mac68k/mem.c
+++ b/sys/arch/mac68k/mac68k/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.21 1999/03/26 23:41:30 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -137,7 +137,7 @@ mmrw(dev, uio, flags)
 
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/mvme68k/mvme68k/mem.c b/sys/arch/mvme68k/mvme68k/mem.c
index 093e9e512016..7a7099ff8813 100644
--- a/sys/arch/mvme68k/mvme68k/mem.c
+++ b/sys/arch/mvme68k/mvme68k/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.9 1999/03/26 23:41:31 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.10 1999/03/27 00:30:07 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -129,7 +129,7 @@ mmrw(dev, uio, flags)
 #endif
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/next68k/next68k/mem.c b/sys/arch/next68k/next68k/mem.c
index 622ff32b07ec..4ae40bb3906d 100644
--- a/sys/arch/next68k/next68k/mem.c
+++ b/sys/arch/next68k/next68k/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.7 1999/03/26 23:41:32 mycroft Exp $ */
+/*	$NetBSD: mem.c,v 1.8 1999/03/27 00:30:07 mycroft Exp $ */
 
 /*
  * This file was taken from mvme68k/mvme68k/mem.c
@@ -136,7 +136,7 @@ mmrw(dev, uio, flags)
 #endif
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/pc532/pc532/mem.c b/sys/arch/pc532/pc532/mem.c
index 587018211f9f..6374ebbe7559 100644
--- a/sys/arch/pc532/pc532/mem.c
+++ b/sys/arch/pc532/pc532/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.21 1999/03/26 23:41:33 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -125,7 +125,7 @@ mmrw(dev, uio, flags)
 			v = uio->uio_offset;
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/sparc/sparc/mem.c b/sys/arch/sparc/sparc/mem.c
index a0ab10b86546..8ec115ae5078 100644
--- a/sys/arch/sparc/sparc/mem.c
+++ b/sys/arch/sparc/sparc/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.19 1999/03/26 23:41:35 mycroft Exp $ */
+/*	$NetBSD: mem.c,v 1.20 1999/03/27 00:30:07 mycroft Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -131,7 +131,7 @@ mmrw(dev, uio, flags)
 			}
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/sparc64/sparc64/mem.c b/sys/arch/sparc64/sparc64/mem.c
index ea6f967663f1..9a33666dd42e 100644
--- a/sys/arch/sparc64/sparc64/mem.c
+++ b/sys/arch/sparc64/sparc64/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.7 1999/03/26 23:41:36 mycroft Exp $ */
+/*	$NetBSD: mem.c,v 1.8 1999/03/27 00:30:07 mycroft Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -132,7 +132,7 @@ mmrw(dev, uio, flags)
 			}
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
diff --git a/sys/arch/sun3/sun3/mem.c b/sys/arch/sun3/sun3/mem.c
index 6ed8ab84b491..afba281672b2 100644
--- a/sys/arch/sun3/sun3/mem.c
+++ b/sys/arch/sun3/sun3/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.31 1999/03/26 23:41:37 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.32 1999/03/27 00:30:07 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -161,12 +161,13 @@ mmrw(dev, uio, flags)
 			/* Temporarily map the memory at vmmap. */
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = v & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
 			error = uiomove((caddr_t)vmmap + o, c, uio);
-			pmap_remove(pmap_kernel(), vmmap, vmmap + NBPG);
+			pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
+			    (vaddr_t)vmmap + NBPG);
 			break;
 
 		case 1:                        /*  /dev/kmem  */
diff --git a/sys/arch/sun3/sun3x/mem.c b/sys/arch/sun3/sun3x/mem.c
index c874dab8f2ad..fc9ad766a91d 100644
--- a/sys/arch/sun3/sun3x/mem.c
+++ b/sys/arch/sun3/sun3x/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.12 1999/03/26 23:41:37 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.13 1999/03/27 00:30:08 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -156,12 +156,13 @@ mmrw(dev, uio, flags)
 			/* Temporarily map the memory at vmmap. */
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = v & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));
 			error = uiomove((caddr_t)vmmap + o, c, uio);
-			pmap_remove(pmap_kernel(), vmmap, vmmap + NBPG);
+			pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
+			    (vaddr_t)vmmap + NBPG);
 			break;
 
 		case 1:                        /*  /dev/kmem  */
diff --git a/sys/arch/x68k/x68k/mem.c b/sys/arch/x68k/x68k/mem.c
index 3d91d4d58b7a..158441855d2f 100644
--- a/sys/arch/x68k/x68k/mem.c
+++ b/sys/arch/x68k/x68k/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.14 1999/03/26 23:41:38 mycroft Exp $	*/
+/*	$NetBSD: mem.c,v 1.15 1999/03/27 00:30:08 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -134,7 +134,7 @@ mmrw(dev, uio, flags)
 #endif
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
 			    trunc_page(v), prot, TRUE, prot);
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(NBPG - o));