From 533ad6c08bd371c76ba75bccaca0fc6de122237a Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sun, 21 Sep 2003 06:52:42 +0000
Subject: [PATCH] Fix more GCC 3.3.1 nits.

---
 sys/arch/acorn26/acorn26/machdep.c | 6 +++---
 sys/arch/acorn26/include/intr.h    | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/arch/acorn26/acorn26/machdep.c b/sys/arch/acorn26/acorn26/machdep.c
index 8e04a1d248df..b66bf91bec14 100644
--- a/sys/arch/acorn26/acorn26/machdep.c
+++ b/sys/arch/acorn26/acorn26/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.8 2003/05/31 00:38:05 kristerw Exp $ */
+/* $NetBSD: machdep.c,v 1.9 2003/09/21 06:52:42 matt Exp $ */
 
 /*-
  * Copyright (c) 1998 Ben Harris
@@ -32,7 +32,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2003/05/31 00:38:05 kristerw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2003/09/21 06:52:42 matt Exp $");
 
 #include <sys/buf.h>
 #include <sys/kernel.h>
@@ -161,7 +161,7 @@ cpu_startup()
 	 * and usually occupy more virtual memory than physical.
 	 */
 	size = MAXBSIZE * nbuf;
-	if (uvm_map(kernel_map, (vaddr_t *) &buffers, round_page(size),
+	if (uvm_map(kernel_map, (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/acorn26/include/intr.h b/sys/arch/acorn26/include/intr.h
index f3125eb48cb4..ecb6ca959c4e 100644
--- a/sys/arch/acorn26/include/intr.h
+++ b/sys/arch/acorn26/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3 2003/06/16 20:00:56 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.4 2003/09/21 06:52:43 matt Exp $ */
 /*-
  * Copyright (c) 1998, 2000 Ben Harris
  * All rights reserved.
@@ -82,8 +82,6 @@
 #define spllowersoftclock()	lowerspl(IPL_SOFTCLOCK)
 #define splx(s)			lowerspl(s)
 
-extern int current_spl; /* XXX tautological name */
-
 extern int splhigh(void);
 extern int raisespl(int);
 extern void lowerspl(int);