Module Name: src
Committed By: tsutsui
Date: Sat Feb 26 12:07:46 UTC 2011
Modified Files:
src/sys/arch/hpcmips/hpcmips: bus_dma.c bus_space.c
src/sys/arch/hpcmips/tx: tx39.c
src/sys/arch/hpcmips/vr: vr.c
Log Message:
Explicitly include <mips/locore.h> for wbflush().
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hpcmips/hpcmips/bus_dma.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/hpcmips/hpcmips/bus_space.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hpcmips/tx/tx39.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/hpcmips/vr/vr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcmips/hpcmips/bus_dma.c
diff -u src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.37
--- src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 Sun Feb 20 07:58:13 2011
+++ src/sys/arch/hpcmips/hpcmips/bus_dma.c Sat Feb 26 12:07:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $ */
+/* $NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.37 2011/02/26 12:07:45 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,6 +40,7 @@
#include <uvm/uvm_extern.h>
#include <mips/cache.h>
+#include <mips/locore.h>
#include <machine/bus.h>
#include <machine/bus_dma_hpcmips.h>
Index: src/sys/arch/hpcmips/hpcmips/bus_space.c
diff -u src/sys/arch/hpcmips/hpcmips/bus_space.c:1.29 src/sys/arch/hpcmips/hpcmips/bus_space.c:1.30
--- src/sys/arch/hpcmips/hpcmips/bus_space.c:1.29 Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/hpcmips/bus_space.c Sat Feb 26 12:07:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.29 2011/02/20 07:58:14 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.29 2011/02/20 07:58:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.30 2011/02/26 12:07:45 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@
#include <uvm/uvm_extern.h>
#include <mips/cache.h>
+#include <mips/locore.h>
#include <mips/pte.h>
#include <machine/bus.h>
#include <machine/bus_space_hpcmips.h>
Index: src/sys/arch/hpcmips/tx/tx39.c
diff -u src/sys/arch/hpcmips/tx/tx39.c:1.42 src/sys/arch/hpcmips/tx/tx39.c:1.43
--- src/sys/arch/hpcmips/tx/tx39.c:1.42 Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/tx/tx39.c Sat Feb 26 12:07:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39.c,v 1.42 2011/02/20 07:58:14 matt Exp $ */
+/* $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.42 2011/02/20 07:58:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -44,6 +44,7 @@
#include <uvm/uvm_extern.h>
#include <mips/cache.h>
+#include <mips/locore.h>
#include <machine/bootinfo.h> /* bootinfo */
#include <machine/sysconf.h> /* platform */
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.59 src/sys/arch/hpcmips/vr/vr.c:1.60
--- src/sys/arch/hpcmips/vr/vr.c:1.59 Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/vr/vr.c Sat Feb 26 12:07:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.59 2011/02/20 07:58:14 matt Exp $ */
+/* $NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.59 2011/02/20 07:58:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.60 2011/02/26 12:07:46 tsutsui Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -52,6 +52,9 @@
#include <uvm/uvm_extern.h>
+#include <mips/cache.h>
+#include <mips/locore.h>
+
#include <machine/sysconf.h>
#include <machine/bootinfo.h>
#include <machine/bus_space_hpcmips.h>
@@ -66,8 +69,6 @@
#include <hpcmips/vr/vripreg.h>
#include <hpcmips/vr/rtcreg.h>
-#include <mips/cache.h>
-
#include "vrip_common.h"
#if NVRIP_COMMON > 0
#include <hpcmips/vr/vripvar.h>
