Module Name: src
Committed By: christos
Date: Thu Jul 21 19:49:59 UTC 2016
Modified Files:
src/sys/arch/newsmips/apbus: xafb.c
src/sys/arch/newsmips/dev: scsi_1185.c zs_hb.c
src/sys/arch/newsmips/include: intr.h
src/sys/arch/newsmips/newsmips: machdep.c news5000.c
Log Message:
Don't include <mips/locore.h> in <machine/intr.h>, introduces circular
dependencies; instead include it in the 4 driver files that need it,
and reorder it in machdep.c
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/newsmips/apbus/xafb.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/newsmips/dev/scsi_1185.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/newsmips/dev/zs_hb.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/newsmips/include/intr.h
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/newsmips/newsmips/news5000.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/newsmips/apbus/xafb.c
diff -u src/sys/arch/newsmips/apbus/xafb.c:1.17 src/sys/arch/newsmips/apbus/xafb.c:1.18
--- src/sys/arch/newsmips/apbus/xafb.c:1.17 Fri Jan 31 10:43:06 2014
+++ src/sys/arch/newsmips/apbus/xafb.c Thu Jul 21 15:49:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xafb.c,v 1.17 2014/01/31 15:43:06 tsutsui Exp $ */
+/* $NetBSD: xafb.c,v 1.18 2016/07/21 19:49:58 christos Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -29,7 +29,7 @@
/* "xa" frame buffer driver. Currently supports 1280x1024x8 only. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.17 2014/01/31 15:43:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.18 2016/07/21 19:49:58 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -40,10 +40,12 @@ __KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.1
#include <uvm/uvm_extern.h>
+#include <mips/locore.h>
+
#include <machine/adrsmap.h>
#include <machine/apcall.h>
-
#include <machine/wsconsio.h>
+
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
Index: src/sys/arch/newsmips/dev/scsi_1185.c
diff -u src/sys/arch/newsmips/dev/scsi_1185.c:1.22 src/sys/arch/newsmips/dev/scsi_1185.c:1.23
--- src/sys/arch/newsmips/dev/scsi_1185.c:1.22 Sat Mar 26 13:14:38 2016
+++ src/sys/arch/newsmips/dev/scsi_1185.c Thu Jul 21 15:49:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_1185.c,v 1.22 2016/03/26 17:14:38 martin Exp $ */
+/* $NetBSD: scsi_1185.c,v 1.23 2016/07/21 19:49:58 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.22 2016/03/26 17:14:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.23 2016/07/21 19:49:58 christos Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -67,11 +67,13 @@ __KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
+#include <mips/locore.h>
+#include <mips/cache.h>
+
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/machConst.h>
-#include <mips/cache.h>
#include <newsmips/dev/screg_1185.h>
#include <newsmips/dev/scsireg.h>
Index: src/sys/arch/newsmips/dev/zs_hb.c
diff -u src/sys/arch/newsmips/dev/zs_hb.c:1.26 src/sys/arch/newsmips/dev/zs_hb.c:1.27
--- src/sys/arch/newsmips/dev/zs_hb.c:1.26 Fri Jun 25 23:44:49 2010
+++ src/sys/arch/newsmips/dev/zs_hb.c Thu Jul 21 15:49:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_hb.c,v 1.26 2010/06/26 03:44:49 tsutsui Exp $ */
+/* $NetBSD: zs_hb.c,v 1.27 2016/07/21 19:49:58 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.26 2010/06/26 03:44:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.27 2016/07/21 19:49:58 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,6 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: zs_hb.c,v 1.
#include <sys/cpu.h>
#include <sys/intr.h>
+#include <mips/locore.h>
+
#include <machine/adrsmap.h>
#include <machine/z8530var.h>
Index: src/sys/arch/newsmips/include/intr.h
diff -u src/sys/arch/newsmips/include/intr.h:1.25 src/sys/arch/newsmips/include/intr.h:1.26
--- src/sys/arch/newsmips/include/intr.h:1.25 Sun Feb 20 02:56:31 2011
+++ src/sys/arch/newsmips/include/intr.h Thu Jul 21 15:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.25 2011/02/20 07:56:31 matt Exp $ */
+/* $NetBSD: intr.h,v 1.26 2016/07/21 19:49:59 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
#ifdef __INTR_PRIVATE
#include <sys/evcnt.h>
-#include <mips/locore.h>
extern const struct ipl_sr_map newmips_ipl_sr_map;
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.117 src/sys/arch/newsmips/newsmips/machdep.c:1.118
--- src/sys/arch/newsmips/newsmips/machdep.c:1.117 Mon Jun 29 22:39:03 2015
+++ src/sys/arch/newsmips/newsmips/machdep.c Thu Jul 21 15:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.117 2015/06/30 02:39:03 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.118 2016/07/21 19:49:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.117 2015/06/30 02:39:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.118 2016/07/21 19:49:59 christos Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -75,6 +75,9 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <ufs/mfs/mfs_extern.h> /* mfs_initminiroot() */
+#include <mips/cache.h>
+#include <mips/locore.h>
+
#include <machine/reg.h>
#include <machine/psl.h>
#include <machine/pte.h>
@@ -83,8 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/apbus.h>
#include <machine/apcall.h>
-#include <mips/cache.h>
-#include <mips/locore.h>
#define _NEWSMIPS_BUS_DMA_PRIVATE
#include <machine/bus.h>
Index: src/sys/arch/newsmips/newsmips/news5000.c
diff -u src/sys/arch/newsmips/newsmips/news5000.c:1.20 src/sys/arch/newsmips/newsmips/news5000.c:1.21
--- src/sys/arch/newsmips/newsmips/news5000.c:1.20 Thu Mar 10 10:40:36 2011
+++ src/sys/arch/newsmips/newsmips/news5000.c Thu Jul 21 15:49:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: news5000.c,v 1.20 2011/03/10 15:40:36 tsutsui Exp $ */
+/* $NetBSD: news5000.c,v 1.21 2016/07/21 19:49:59 christos Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: news5000.c,v 1.20 2011/03/10 15:40:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: news5000.c,v 1.21 2016/07/21 19:49:59 christos Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -37,6 +37,8 @@ __KERNEL_RCSID(0, "$NetBSD: news5000.c,v
#include <sys/cpu.h>
#include <sys/intr.h>
+#include <mips/locore.h>
+
#include <machine/adrsmap.h>
#include <newsmips/apbus/apbusvar.h>
