Module Name: src
Committed By: matt
Date: Tue Jun 9 22:46:36 UTC 2015
Modified Files:
src/sys/arch/hpcmips/dev: tc5165buf.c
src/sys/arch/hpcmips/hpcmips: interrupt.c kloader_machdep.c
src/sys/arch/hpcmips/vr: vrdmaau.c vrdsu.c
Log Message:
#include <sys/cpu.h> and/or <mips/cpuregs.h> + other include fixes
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/dev/tc5165buf.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcmips/hpcmips/interrupt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcmips/hpcmips/kloader_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hpcmips/vr/vrdmaau.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hpcmips/vr/vrdsu.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/dev/tc5165buf.c
diff -u src/sys/arch/hpcmips/dev/tc5165buf.c:1.17 src/sys/arch/hpcmips/dev/tc5165buf.c:1.18
--- src/sys/arch/hpcmips/dev/tc5165buf.c:1.17 Sat Oct 27 17:17:53 2012
+++ src/sys/arch/hpcmips/dev/tc5165buf.c Tue Jun 9 22:46:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tc5165buf.c,v 1.17 2012/10/27 17:17:53 chs Exp $ */
+/* $NetBSD: tc5165buf.c,v 1.18 2015/06/09 22:46:36 matt Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -35,20 +35,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc5165buf.c,v 1.17 2012/10/27 17:17:53 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc5165buf.c,v 1.18 2015/06/09 22:46:36 matt Exp $");
#include "opt_use_poll.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/callout.h>
#include <sys/device.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
#include <dev/hpc/hpckbdvar.h>
+#include <mips/cpuregs.h>
+
#include <hpcmips/tx/tx39var.h>
#include <hpcmips/tx/txcsbusvar.h>
#include <hpcmips/dev/tc5165bufvar.h>
Index: src/sys/arch/hpcmips/hpcmips/interrupt.c
diff -u src/sys/arch/hpcmips/hpcmips/interrupt.c:1.18 src/sys/arch/hpcmips/hpcmips/interrupt.c:1.19
--- src/sys/arch/hpcmips/hpcmips/interrupt.c:1.18 Sun Feb 20 07:58:14 2011
+++ src/sys/arch/hpcmips/hpcmips/interrupt.c Tue Jun 9 22:46:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.18 2011/02/20 07:58:14 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.19 2015/06/09 22:46:36 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.18 2011/02/20 07:58:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.19 2015/06/09 22:46:36 matt Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: interrupt.c,
#define __INTR_PRIVATE
#include <sys/param.h>
+#include <sys/cpu.h>
#include <sys/malloc.h>
#include <sys/intr.h>
Index: src/sys/arch/hpcmips/hpcmips/kloader_machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.7 src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.8
--- src/sys/arch/hpcmips/hpcmips/kloader_machdep.c:1.7 Wed Mar 18 10:22:29 2009
+++ src/sys/arch/hpcmips/hpcmips/kloader_machdep.c Tue Jun 9 22:46:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader_machdep.c,v 1.7 2009/03/18 10:22:29 cegger Exp $ */
+/* $NetBSD: kloader_machdep.c,v 1.8 2015/06/09 22:46:36 matt Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,10 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.7 2009/03/18 10:22:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.8 2015/06/09 22:46:36 matt Exp $");
#include <sys/param.h>
+#include <sys/cpu.h>
#include <sys/systm.h>
+
#include <mips/cache.h>
#include <machine/sysconf.h>
Index: src/sys/arch/hpcmips/vr/vrdmaau.c
diff -u src/sys/arch/hpcmips/vr/vrdmaau.c:1.6 src/sys/arch/hpcmips/vr/vrdmaau.c:1.7
--- src/sys/arch/hpcmips/vr/vrdmaau.c:1.6 Sat Oct 27 17:17:56 2012
+++ src/sys/arch/hpcmips/vr/vrdmaau.c Tue Jun 9 22:46:36 2015
@@ -24,13 +24,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrdmaau.c,v 1.6 2012/10/27 17:17:56 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrdmaau.c,v 1.7 2015/06/09 22:46:36 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/systm.h>
-#include <machine/bus.h>
+#include <mips/cpuregs.h>
#include <hpcmips/vr/vripif.h>
#include <hpcmips/vr/dmaaureg.h>
Index: src/sys/arch/hpcmips/vr/vrdsu.c
diff -u src/sys/arch/hpcmips/vr/vrdsu.c:1.11 src/sys/arch/hpcmips/vr/vrdsu.c:1.12
--- src/sys/arch/hpcmips/vr/vrdsu.c:1.11 Sat Oct 27 17:17:56 2012
+++ src/sys/arch/hpcmips/vr/vrdsu.c Tue Jun 9 22:46:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vrdsu.c,v 1.11 2012/10/27 17:17:56 chs Exp $ */
+/* $NetBSD: vrdsu.c,v 1.12 2015/06/09 22:46:36 matt Exp $ */
/*
* Copyright (c) 1999 Shin Takemura All rights reserved.
@@ -27,14 +27,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrdsu.c,v 1.11 2012/10/27 17:17:56 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrdsu.c,v 1.12 2015/06/09 22:46:36 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
-#include <uvm/uvm_param.h>
+#include <sys/systm.h>
+
+#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <mips/cpuregs.h>
#include <hpcmips/vr/vripif.h>
#include <hpcmips/vr/dsureg.h>
