[src/trunk]: src/sys/arch/hpcmips #include <sys/cpu.h> and/or <mips/cpuregs.h...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c35c5f0d1dc8
branches:  trunk
changeset: 338814:c35c5f0d1dc8
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jun 09 22:46:36 2015 +0000

description:
#include <sys/cpu.h> and/or <mips/cpuregs.h> + other include fixes

diffstat:

 sys/arch/hpcmips/dev/tc5165buf.c           |  13 +++++++------
 sys/arch/hpcmips/hpcmips/interrupt.c       |   5 +++--
 sys/arch/hpcmips/hpcmips/kloader_machdep.c |   6 ++++--
 sys/arch/hpcmips/vr/vrdmaau.c              |   7 ++++---
 sys/arch/hpcmips/vr/vrdsu.c                |  12 +++++++-----
 5 files changed, 25 insertions(+), 18 deletions(-)

diffs (136 lines):

diff -r c48f6be6a05e -r c35c5f0d1dc8 sys/arch/hpcmips/dev/tc5165buf.c
--- a/sys/arch/hpcmips/dev/tc5165buf.c  Tue Jun 09 21:42:21 2015 +0000
+++ b/sys/arch/hpcmips/dev/tc5165buf.c  Tue Jun 09 22:46:36 2015 +0000
@@ -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>
diff -r c48f6be6a05e -r c35c5f0d1dc8 sys/arch/hpcmips/hpcmips/interrupt.c
--- a/sys/arch/hpcmips/hpcmips/interrupt.c      Tue Jun 09 21:42:21 2015 +0000
+++ b/sys/arch/hpcmips/hpcmips/interrupt.c      Tue Jun 09 22:46:36 2015 +0000
@@ -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 @@
 #define __INTR_PRIVATE
 
 #include <sys/param.h>
+#include <sys/cpu.h>
 #include <sys/malloc.h>
 #include <sys/intr.h>
 
diff -r c48f6be6a05e -r c35c5f0d1dc8 sys/arch/hpcmips/hpcmips/kloader_machdep.c
--- a/sys/arch/hpcmips/hpcmips/kloader_machdep.c        Tue Jun 09 21:42:21 2015 +0000
+++ b/sys/arch/hpcmips/hpcmips/kloader_machdep.c        Tue Jun 09 22:46:36 2015 +0000
@@ -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>
diff -r c48f6be6a05e -r c35c5f0d1dc8 sys/arch/hpcmips/vr/vrdmaau.c
--- a/sys/arch/hpcmips/vr/vrdmaau.c     Tue Jun 09 21:42:21 2015 +0000
+++ b/sys/arch/hpcmips/vr/vrdmaau.c     Tue Jun 09 22:46:36 2015 +0000
@@ -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>
diff -r c48f6be6a05e -r c35c5f0d1dc8 sys/arch/hpcmips/vr/vrdsu.c
--- a/sys/arch/hpcmips/vr/vrdsu.c       Tue Jun 09 21:42:21 2015 +0000
+++ b/sys/arch/hpcmips/vr/vrdsu.c       Tue Jun 09 22:46:36 2015 +0000
@@ -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 <machine/bus.h>
+#include <uvm/uvm_extern.h>
+
+#include <mips/cpuregs.h>
 
 #include <hpcmips/vr/vripif.h>
 #include <hpcmips/vr/dsureg.h>