From 28527002f8d1660954fb0dcc6104ffa29ce56380 Mon Sep 17 00:00:00 2001
From: mhitch <mhitch@NetBSD.org>
Date: Sat, 27 Sep 2003 19:34:17 +0000
Subject: [PATCH] Cast through (void *) to appease gcc3.

---
 sys/arch/amiga/amiga/machdep.c | 6 +++---
 sys/arch/amiga/amiga/pmap.c    | 6 +++---
 sys/arch/m68k/m68k/regdump.c   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index ec55e18f07ef..d1e36813fe31 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.185 2003/08/07 16:26:38 agc Exp $	*/
+/*	$NetBSD: machdep.c,v 1.186 2003/09/27 19:34:17 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -85,7 +85,7 @@
 #include "opt_panicbutton.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.185 2003/08/07 16:26:38 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.186 2003/09/27 19:34:17 mhitch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -315,7 +315,7 @@ cpu_startup()
 	 * in that they usually occupy more virtual memory than physical.
 	 */
 	size = MAXBSIZE * nbuf;
-	if (uvm_map(kernel_map, (vm_offset_t *)&buffers, round_page(size),
+	if (uvm_map(kernel_map, (vm_offset_t *)(void *)&buffers, round_page(size),
 	    NULL, UVM_UNKNOWN_OFFSET, 0,
 	    UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
 	    UVM_ADV_NORMAL, 0)) != 0)
diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index 9c61aa4cf3a0..330631c59e9d 100644
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.107 2003/08/07 16:26:39 agc Exp $	*/
+/*	$NetBSD: pmap.c,v 1.108 2003/09/27 19:34:17 mhitch Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.107 2003/08/07 16:26:39 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.108 2003/09/27 19:34:17 mhitch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -568,7 +568,7 @@ pmap_init()
 	if (addr == 0)
 		panic("pmap_init: can't allocate data structures");
 	Segtabzero = (u_int *) addr;
-	(void) pmap_extract(pmap_kernel(), addr, (paddr_t *)&Segtabzeropa);
+	(void) pmap_extract(pmap_kernel(), addr, (paddr_t *)(void *)&Segtabzeropa);
 	addr += AMIGA_STSIZE;
 
 	pv_table = (pv_entry_t) addr;
diff --git a/sys/arch/m68k/m68k/regdump.c b/sys/arch/m68k/m68k/regdump.c
index c33a6afd0ee5..dae9b32414c5 100644
--- a/sys/arch/m68k/m68k/regdump.c
+++ b/sys/arch/m68k/m68k/regdump.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: regdump.c,v 1.6 2003/08/07 16:28:18 agc Exp $	*/
+/*	$NetBSD: regdump.c,v 1.7 2003/09/27 19:34:17 mhitch Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: regdump.c,v 1.6 2003/08/07 16:28:18 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: regdump.c,v 1.7 2003/09/27 19:34:17 mhitch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,8 +126,8 @@ regdump(tf, sbytes)
 	if (sbytes > 0) {
 		if (tf->tf_sr & PSL_S) {
 			printf("\n\nKernel stack (%s):",
-			       hexstr((int)(((int *)&tf)-1), 8));
-			dumpmem(((int *)&tf)-1, sbytes, 0);
+			       hexstr((int)(((int *)(void *)&tf)-1), 8));
+			dumpmem(((int *)(void *)&tf)-1, sbytes, 0);
 		} else {
 			printf("\n\nUser stack (%s):", hexstr(tf->tf_regs[SP], 8));
 			dumpmem((int *)tf->tf_regs[SP], sbytes, 1);