- add a declaration of apbus_wbflush() in apbusvar.h

- include <mips/locore.h> for mips3_wbflush()
- undef wbflush() macro before declaration of local inlined wbflush()

sys/arch/newsmips/apbus/apbusvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: apbusvar.h,v 1.7 2005/12/11 12:18:24 christos Exp $	*/
+/*	$NetBSD: apbusvar.h,v 1.8 2007/06/17 05:53:01 tsutsui Exp $	*/
 
 /*-
  * Copyright (C) 1999 SHIMIZU Ryo.  All rights reserved.
@@ -47,5 +47,6 @@ int apbus_intr_dispatch(int, int);
 void *apbus_intr_establish(int, int, int, int (*)(void *), void *,
     const char *, int);
 struct newsmips_bus_dma_tag *apbus_dmatag_init(struct apbus_attach_args *);
+void apbus_wbflush(void);
 
 #define	SLOTTOMASK(slot)	((slot) ? (0x0100 << ((slot) - 1)) : 0)

sys/arch/newsmips/apbus/if_sn.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sn.c,v 1.23 2007/03/08 22:08:50 he Exp $	*/
+/*	$NetBSD: if_sn.c,v 1.24 2007/06/17 05:53:02 tsutsui Exp $	*/
 
 /*
  * National Semiconductor  DP8393X SONIC Driver
@@ -16,7 +16,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.23 2007/03/08 22:08:50 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.24 2007/06/17 05:53:02 tsutsui Exp $");
 
 #include "opt_inet.h"
 
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sn.c,v 1.23 2007/03/08 22:08:50 he Exp $");
 #endif
 
 #include <machine/cpu.h>
+#include <newsmips/apbus/apbusvar.h>
 #include <newsmips/apbus/if_snreg.h>
 #include <newsmips/apbus/if_snvar.h>
 

sys/arch/newsmips/apbus/if_snvar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: if_snvar.h,v 1.9 2007/03/08 22:08:50 he Exp $	*/
+/*	$NetBSD: if_snvar.h,v 1.10 2007/06/17 05:53:02 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1991   Algorithmics Ltd (http://www.algor.co.uk)
@@ -31,8 +31,8 @@
 
 #define	SN_REGSIZE	(SN_NREGS * 4)
 
-void mips3_wbflush(void);
-void apbus_wbflush(void);
+#include <mips/locore.h>
+#undef wbflush	/* XXX */
 
 static inline void
 wbflush(void)