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

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

details:   https://anonhg.NetBSD.org/src/rev/0fc5650ba59a
branches:  trunk
changeset: 338819:0fc5650ba59a
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jun 09 22:50:50 2015 +0000

description:
#include <sys/cpu.h> or <mips/cpuregs.h> as needed

diffstat:

 sys/arch/mips/adm5120/adm5120_obio_dma.c |   6 ++++--
 sys/arch/mips/alchemy/au1000.c           |   4 +++-
 sys/arch/mips/alchemy/au1100.c           |   6 ++++--
 sys/arch/mips/alchemy/au1500.c           |   6 ++++--
 sys/arch/mips/alchemy/au1550.c           |   6 ++++--
 sys/arch/mips/alchemy/au_chipdep.c       |   6 ++++--
 sys/arch/mips/alchemy/include/auvar.h    |   4 +++-
 sys/arch/mips/atheros/ar5312_board.c     |  10 ++++++----
 sys/arch/mips/atheros/ar7100.c           |   5 +++--
 sys/arch/mips/atheros/ar_conf.c          |   5 +++--
 sys/arch/mips/atheros/ar_intr.c          |   6 ++++--
 sys/arch/mips/atheros/dev/athflash.c     |   9 ++-------
 sys/arch/mips/atheros/dev/if_ae.c        |  10 +++-------
 sys/arch/mips/atheros/include/arbusvar.h |   5 ++++-
 sys/arch/mips/bonito/bonitovar.h         |   4 +++-
 sys/arch/mips/mips/bds_emul.S            |   3 ++-
 16 files changed, 56 insertions(+), 39 deletions(-)

diffs (truncated from 399 to 300 lines):

diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/adm5120/adm5120_obio_dma.c
--- a/sys/arch/mips/adm5120/adm5120_obio_dma.c  Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/adm5120/adm5120_obio_dma.c  Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $      */
+/*     $NetBSD: adm5120_obio_dma.c,v 1.5 2015/06/09 22:50:50 matt Exp $        */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,13 +64,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.4 2011/07/01 18:38:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio_dma.c,v 1.5 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 
 #define        _MIPS_BUS_DMA_PRIVATE
 #include <sys/bus.h>
 
+#include <mips/cpuregs.h>
+
 #include <mips/adm5120/include/adm5120_obiovar.h>
 
 void
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/alchemy/au1000.c
--- a/sys/arch/mips/alchemy/au1000.c    Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/alchemy/au1000.c    Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: au1000.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1000.c,v 1.11 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -101,6 +101,8 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/alchemy/au1100.c
--- a/sys/arch/mips/alchemy/au1100.c    Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/alchemy/au1100.c    Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: au1100.c,v 1.10 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1100.c,v 1.11 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.10 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.11 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/alchemy/au1500.c
--- a/sys/arch/mips/alchemy/au1500.c    Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/alchemy/au1500.c    Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: au1500.c,v 1.11 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1500.c,v 1.12 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.11 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.12 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/alchemy/au1550.c
--- a/sys/arch/mips/alchemy/au1550.c    Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/alchemy/au1550.c    Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: au1550.c,v 1.14 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au1550.c,v 1.15 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -97,10 +97,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.14 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.15 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/alchemy/au_chipdep.c
--- a/sys/arch/mips/alchemy/au_chipdep.c        Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/alchemy/au_chipdep.c        Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: au_chipdep.c,v 1.4 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: au_chipdep.c,v 1.5 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,10 +32,12 @@
  */ 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.4 2011/07/10 23:13:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.5 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/cpu.h>
+
 #include <mips/locore.h>
 #include <mips/alchemy/include/aureg.h>
 #include <mips/alchemy/include/auvar.h>
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/alchemy/include/auvar.h
--- a/sys/arch/mips/alchemy/include/auvar.h     Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/alchemy/include/auvar.h     Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auvar.h,v 1.11 2011/07/10 23:13:23 matt Exp $ */
+/* $NetBSD: auvar.h,v 1.12 2015/06/09 22:50:50 matt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -69,6 +69,8 @@
 #ifndef _MIPS_ALCHEMY_AUVAR_H_
 #define        _MIPS_ALCHEMY_AUVAR_H_
 
+#include <mips/cpuregs.h>
+
 #include "opt_alchemy.h"
 
 struct au_dev {
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/atheros/ar5312_board.c
--- a/sys/arch/mips/atheros/ar5312_board.c      Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/atheros/ar5312_board.c      Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ar5312_board.c,v 1.4 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: ar5312_board.c,v 1.5 2015/06/09 22:50:50 matt Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -40,13 +40,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.4 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.5 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
 #include <sys/device.h>
+#include <sys/systm.h>
 
-#include <sys/bus.h>
+#include <mips/cpuregs.h>
+
 #include <mips/atheros/include/ar5312reg.h>
 #include <mips/atheros/include/platform.h>
 
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/atheros/ar7100.c
--- a/sys/arch/mips/atheros/ar7100.c    Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/atheros/ar7100.c    Tue Jun 09 22:50:50 2015 +0000
@@ -29,18 +29,19 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: ar7100.c,v 1.2 2011/07/31 23:10:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar7100.c,v 1.3 2015/06/09 22:50:50 matt Exp $");
 
 #define        __INTR_PRIVATE
 #include "pci.h"
 #include "opt_memsize.h"
 
 #include <sys/param.h>
-
 #include <sys/device.h>
+#include <sys/cpu.h>
 
 #include <prop/proplib.h>
 
+#include <mips/cpuregs.h>
 #include <mips/atheros/include/platform.h>
 #include <mips/atheros/include/ar9344reg.h>
 
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/atheros/ar_conf.c
--- a/sys/arch/mips/atheros/ar_conf.c   Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/atheros/ar_conf.c   Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ar_conf.c,v 1.2 2011/07/10 06:26:02 matt Exp $ */
+/*     $NetBSD: ar_conf.c,v 1.3 2015/06/09 22:50:50 matt Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,9 +30,10 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: ar_conf.c,v 1.2 2011/07/10 06:26:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar_conf.c,v 1.3 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
+#include <sys/cpu.h>
 
 #include "opt_wisoc.h"
 
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/atheros/ar_intr.c
--- a/sys/arch/mips/atheros/ar_intr.c   Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/atheros/ar_intr.c   Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_intr.c,v 1.3 2011/07/10 06:24:18 matt Exp $ */
+/* $NetBSD: ar_intr.c,v 1.4 2015/06/09 22:50:50 matt Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
@@ -41,15 +41,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar_intr.c,v 1.3 2011/07/10 06:24:18 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar_intr.c,v 1.4 2015/06/09 22:50:50 matt Exp $");
 
 #define __INTR_PRIVATE
 
 #include <sys/param.h>
 #include <sys/intr.h>
+#include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
+#include <mips/cpuregs.h>
 #include <mips/locore.h>
 #include <mips/atheros/include/platform.h>
 
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/atheros/dev/athflash.c
--- a/sys/arch/mips/atheros/dev/athflash.c      Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/atheros/dev/athflash.c      Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: athflash.c,v 1.8 2014/07/25 08:10:34 dholland Exp $ */
+/* $NetBSD: athflash.c,v 1.9 2015/06/09 22:50:50 matt Exp $ */
 
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.8 2014/07/25 08:10:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athflash.c,v 1.9 2015/06/09 22:50:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -318,8 +318,6 @@
 flashwrite(dev_t dev, struct uio *uio, int flag)
 {
        struct flash_softc      *sc;
-       bus_space_tag_t         iot;
-       bus_space_handle_t      ioh;
        bus_size_t              off;
        int                     stat;
        int                     error;
@@ -333,9 +331,6 @@
        if (uio->uio_resid % sc->sc_sector_size)
                return EINVAL;
 
-       iot = sc->sc_iot;
-       ioh = sc->sc_ioh;
-       
        for (off = uio->uio_offset;
             uio->uio_resid > 0;
             off += sc->sc_sector_size) {
diff -r e431df32a5f3 -r 0fc5650ba59a sys/arch/mips/atheros/dev/if_ae.c
--- a/sys/arch/mips/atheros/dev/if_ae.c Tue Jun 09 22:49:55 2015 +0000
+++ b/sys/arch/mips/atheros/dev/if_ae.c Tue Jun 09 22:50:50 2015 +0000
@@ -1,4 +1,4 @@
-/* $Id: if_ae.c,v 1.25 2014/08/10 16:44:34 tls Exp $ */
+/* $Id: if_ae.c,v 1.26 2015/06/09 22:50:50 matt Exp $ */
 /*-