Module Name: src
Committed By: matt
Date: Tue Jun 9 22:50:50 UTC 2015
Modified Files:
src/sys/arch/mips/adm5120: adm5120_obio_dma.c
src/sys/arch/mips/alchemy: au1000.c au1100.c au1500.c au1550.c
au_chipdep.c
src/sys/arch/mips/alchemy/include: auvar.h
src/sys/arch/mips/atheros: ar5312_board.c ar7100.c ar_conf.c ar_intr.c
src/sys/arch/mips/atheros/dev: athflash.c if_ae.c
src/sys/arch/mips/atheros/include: arbusvar.h
src/sys/arch/mips/bonito: bonitovar.h
src/sys/arch/mips/mips: bds_emul.S
Log Message:
#include <sys/cpu.h> or <mips/cpuregs.h> as needed
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/adm5120/adm5120_obio_dma.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/alchemy/au1000.c \
src/sys/arch/mips/alchemy/au1100.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/alchemy/au1500.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/alchemy/au1550.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/alchemy/au_chipdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/alchemy/include/auvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/atheros/ar5312_board.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/ar7100.c \
src/sys/arch/mips/atheros/ar_conf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/atheros/ar_intr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/atheros/dev/athflash.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mips/atheros/dev/if_ae.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/atheros/include/arbusvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/bonito/bonitovar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/mips/bds_emul.S
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/mips/adm5120/adm5120_obio_dma.c
diff -u src/sys/arch/mips/adm5120/adm5120_obio_dma.c:1.4 src/sys/arch/mips/adm5120/adm5120_obio_dma.c:1.5
--- src/sys/arch/mips/adm5120/adm5120_obio_dma.c:1.4 Fri Jul 1 18:38:49 2011
+++ src/sys/arch/mips/adm5120/adm5120_obio_dma.c Tue Jun 9 22:50:50 2015
@@ -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
Index: src/sys/arch/mips/alchemy/au1000.c
diff -u src/sys/arch/mips/alchemy/au1000.c:1.10 src/sys/arch/mips/alchemy/au1000.c:1.11
--- src/sys/arch/mips/alchemy/au1000.c:1.10 Sun Jul 10 23:13:23 2011
+++ src/sys/arch/mips/alchemy/au1000.c Tue Jun 9 22:50:50 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD");
#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>
Index: src/sys/arch/mips/alchemy/au1100.c
diff -u src/sys/arch/mips/alchemy/au1100.c:1.10 src/sys/arch/mips/alchemy/au1100.c:1.11
--- src/sys/arch/mips/alchemy/au1100.c:1.10 Sun Jul 10 23:13:23 2011
+++ src/sys/arch/mips/alchemy/au1100.c Tue Jun 9 22:50:50 2015
@@ -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>
Index: src/sys/arch/mips/alchemy/au1500.c
diff -u src/sys/arch/mips/alchemy/au1500.c:1.11 src/sys/arch/mips/alchemy/au1500.c:1.12
--- src/sys/arch/mips/alchemy/au1500.c:1.11 Sun Jul 10 23:13:23 2011
+++ src/sys/arch/mips/alchemy/au1500.c Tue Jun 9 22:50:50 2015
@@ -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>
Index: src/sys/arch/mips/alchemy/au1550.c
diff -u src/sys/arch/mips/alchemy/au1550.c:1.14 src/sys/arch/mips/alchemy/au1550.c:1.15
--- src/sys/arch/mips/alchemy/au1550.c:1.14 Sun Jul 10 23:13:23 2011
+++ src/sys/arch/mips/alchemy/au1550.c Tue Jun 9 22:50:50 2015
@@ -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>
Index: src/sys/arch/mips/alchemy/au_chipdep.c
diff -u src/sys/arch/mips/alchemy/au_chipdep.c:1.4 src/sys/arch/mips/alchemy/au_chipdep.c:1.5
--- src/sys/arch/mips/alchemy/au_chipdep.c:1.4 Sun Jul 10 23:13:23 2011
+++ src/sys/arch/mips/alchemy/au_chipdep.c Tue Jun 9 22:50:50 2015
@@ -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>
Index: src/sys/arch/mips/alchemy/include/auvar.h
diff -u src/sys/arch/mips/alchemy/include/auvar.h:1.11 src/sys/arch/mips/alchemy/include/auvar.h:1.12
--- src/sys/arch/mips/alchemy/include/auvar.h:1.11 Sun Jul 10 23:13:23 2011
+++ src/sys/arch/mips/alchemy/include/auvar.h Tue Jun 9 22:50:50 2015
@@ -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 {
Index: src/sys/arch/mips/atheros/ar5312_board.c
diff -u src/sys/arch/mips/atheros/ar5312_board.c:1.4 src/sys/arch/mips/atheros/ar5312_board.c:1.5
--- src/sys/arch/mips/atheros/ar5312_board.c:1.4 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/mips/atheros/ar5312_board.c Tue Jun 9 22:50:50 2015
@@ -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 <mips/cpuregs.h>
-#include <sys/bus.h>
#include <mips/atheros/include/ar5312reg.h>
#include <mips/atheros/include/platform.h>
Index: src/sys/arch/mips/atheros/ar7100.c
diff -u src/sys/arch/mips/atheros/ar7100.c:1.2 src/sys/arch/mips/atheros/ar7100.c:1.3
--- src/sys/arch/mips/atheros/ar7100.c:1.2 Sun Jul 31 23:10:58 2011
+++ src/sys/arch/mips/atheros/ar7100.c Tue Jun 9 22:50:50 2015
@@ -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>
Index: src/sys/arch/mips/atheros/ar_conf.c
diff -u src/sys/arch/mips/atheros/ar_conf.c:1.2 src/sys/arch/mips/atheros/ar_conf.c:1.3
--- src/sys/arch/mips/atheros/ar_conf.c:1.2 Sun Jul 10 06:26:02 2011
+++ src/sys/arch/mips/atheros/ar_conf.c Tue Jun 9 22:50:50 2015
@@ -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"
Index: src/sys/arch/mips/atheros/ar_intr.c
diff -u src/sys/arch/mips/atheros/ar_intr.c:1.3 src/sys/arch/mips/atheros/ar_intr.c:1.4
--- src/sys/arch/mips/atheros/ar_intr.c:1.3 Sun Jul 10 06:24:18 2011
+++ src/sys/arch/mips/atheros/ar_intr.c Tue Jun 9 22:50:50 2015
@@ -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>
Index: src/sys/arch/mips/atheros/dev/athflash.c
diff -u src/sys/arch/mips/atheros/dev/athflash.c:1.8 src/sys/arch/mips/atheros/dev/athflash.c:1.9
--- src/sys/arch/mips/atheros/dev/athflash.c:1.8 Fri Jul 25 08:10:34 2014
+++ src/sys/arch/mips/atheros/dev/athflash.c Tue Jun 9 22:50:50 2015
@@ -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 @@ int
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 @@ flashwrite(dev_t dev, struct uio *uio, i
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) {
Index: src/sys/arch/mips/atheros/dev/if_ae.c
diff -u src/sys/arch/mips/atheros/dev/if_ae.c:1.25 src/sys/arch/mips/atheros/dev/if_ae.c:1.26
--- src/sys/arch/mips/atheros/dev/if_ae.c:1.25 Sun Aug 10 16:44:34 2014
+++ src/sys/arch/mips/atheros/dev/if_ae.c Tue Jun 9 22:50:50 2015
@@ -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 $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.25 2014/08/10 16:44:34 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.26 2015/06/09 22:50:50 matt Exp $");
#include <sys/param.h>
@@ -547,7 +547,7 @@ ae_start(struct ifnet *ifp)
{
struct ae_softc *sc = ifp->if_softc;
struct mbuf *m0, *m;
- struct ae_txsoft *txs, *last_txs = NULL;
+ struct ae_txsoft *txs;
bus_dmamap_t dmamap;
int error, firsttx, nexttx, lasttx = 1, ofree, seg;
@@ -728,8 +728,6 @@ ae_start(struct ifnet *ifp)
SIMPLEQ_REMOVE_HEAD(&sc->sc_txfreeq, txs_q);
SIMPLEQ_INSERT_TAIL(&sc->sc_txdirtyq, txs, txs_q);
- last_txs = txs;
-
/*
* Pass the packet to any BPF listeners.
*/
@@ -1011,7 +1009,6 @@ static void
ae_rxintr(struct ae_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
- struct ether_header *eh;
struct ae_rxsoft *rxs;
struct mbuf *m;
u_int32_t rxstat;
@@ -1132,7 +1129,6 @@ ae_rxintr(struct ae_softc *sc)
#endif /* __NO_STRICT_ALIGNMENT */
ifp->if_ipackets++;
- eh = mtod(m, struct ether_header *);
m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = len;
Index: src/sys/arch/mips/atheros/include/arbusvar.h
diff -u src/sys/arch/mips/atheros/include/arbusvar.h:1.4 src/sys/arch/mips/atheros/include/arbusvar.h:1.5
--- src/sys/arch/mips/atheros/include/arbusvar.h:1.4 Sun Jul 10 06:26:02 2011
+++ src/sys/arch/mips/atheros/include/arbusvar.h Tue Jun 9 22:50:50 2015
@@ -1,4 +1,4 @@
-/* $Id: arbusvar.h,v 1.4 2011/07/10 06:26:02 matt Exp $ */
+/* $Id: arbusvar.h,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.
@@ -44,6 +44,9 @@
#define _MIPS_ATHEROS_ARBUSVAR_H_
#include <sys/bus.h>
+#include <sys/cpu.h>
+
+#include <mips/cpuregs.h>
struct arbus_attach_args {
const char *aa_name;
Index: src/sys/arch/mips/bonito/bonitovar.h
diff -u src/sys/arch/mips/bonito/bonitovar.h:1.5 src/sys/arch/mips/bonito/bonitovar.h:1.6
--- src/sys/arch/mips/bonito/bonitovar.h:1.5 Sat Aug 27 12:59:17 2011
+++ src/sys/arch/mips/bonito/bonitovar.h Tue Jun 9 22:50:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bonitovar.h,v 1.5 2011/08/27 12:59:17 bouyer Exp $ */
+/* $NetBSD: bonitovar.h,v 1.6 2015/06/09 22:50:50 matt Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
#include <dev/pci/pcivar.h>
+#include <mips/cpuregs.h>
+
struct bonito_config {
int bc_adbase; /* AD line base for config access */
Index: src/sys/arch/mips/mips/bds_emul.S
diff -u src/sys/arch/mips/mips/bds_emul.S:1.7 src/sys/arch/mips/mips/bds_emul.S:1.8
--- src/sys/arch/mips/mips/bds_emul.S:1.7 Sun Jun 7 06:07:49 2015
+++ src/sys/arch/mips/mips/bds_emul.S Tue Jun 9 22:50:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bds_emul.S,v 1.7 2015/06/07 06:07:49 matt Exp $ */
+/* $NetBSD: bds_emul.S,v 1.8 2015/06/09 22:50:50 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -38,6 +38,7 @@
#include <mips/asm.h>
#include <mips/trap.h> /* for T_RES_INST */
+#include <mips/cpuregs.h>
#include "assym.h"
