From fb30dca86852fe682ed3a0a636c114790c7561b8 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 10 Mar 2007 22:29:24 +0000
Subject: [PATCH] Fix more caddr_t fallout.

---
 sys/arch/sun2/sun2/machdep.c | 6 +++---
 sys/arch/sun2/sun2/mem.c     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/arch/sun2/sun2/machdep.c b/sys/arch/sun2/sun2/machdep.c
index a84ee9c0d209..06d16ab912ba 100644
--- a/sys/arch/sun2/sun2/machdep.c
+++ b/sys/arch/sun2/sun2/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.47 2007/03/04 06:00:52 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.48 2007/03/10 22:29:24 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -160,7 +160,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2007/03/04 06:00:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2007/03/10 22:29:24 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -301,7 +301,7 @@ cpu_startup(void)
 	 * Also, offset some to avoid PROM scribbles.
 	 */
 	v = (void *) (PAGE_SIZE * 4);
-	msgbufaddr = (void *)(v + MSGBUFOFF);
+	msgbufaddr = (void *)((char *)v + MSGBUFOFF);
 	initmsgbuf(msgbufaddr, MSGBUFSIZE);
 
 #if NKSYMS || defined(DDB) || defined(LKM)
diff --git a/sys/arch/sun2/sun2/mem.c b/sys/arch/sun2/sun2/mem.c
index 5d76c8135abe..2c6a23afd48f 100644
--- a/sys/arch/sun2/sun2/mem.c
+++ b/sys/arch/sun2/sun2/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.15 2007/03/04 06:00:52 christos Exp $	*/
+/*	$NetBSD: mem.c,v 1.16 2007/03/10 22:29:24 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.15 2007/03/04 06:00:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.16 2007/03/10 22:29:24 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -182,12 +182,12 @@ mmrw(dev_t dev, struct uio *uio, int flags)
 			/* Temporarily map the memory at vmmap. */
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
+			pmap_enter(pmap_kernel(), vmmap,
 			    trunc_page(v), prot, prot|PMAP_WIRED);
 			pmap_update(pmap_kernel());
 			o = v & PGOFSET;
 			c = min(uio->uio_resid, (int)(PAGE_SIZE - o));
-			error = uiomove((void *)vmmap + o, c, uio);
+			error = uiomove((void *)(vmmap + o), c, uio);
 			pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
 			    (vaddr_t)vmmap + PAGE_SIZE);
 			pmap_update(pmap_kernel());