[src/trunk]: src/sys/arch/newsmips Don't include <mips/locore.h> in <machine/...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/newsmips Don't include <mips/locore.h> in <machine/...
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 20:19:55 +0000

details:   https://anonhg.NetBSD.org/src/rev/1af3d99d0c9f
branches:  trunk
changeset: 346617:1af3d99d0c9f
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jul 21 19:49:58 2016 +0000

description:
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

diffstat:

 sys/arch/newsmips/apbus/xafb.c        |  8 +++++---
 sys/arch/newsmips/dev/scsi_1185.c     |  8 +++++---
 sys/arch/newsmips/dev/zs_hb.c         |  6 ++++--
 sys/arch/newsmips/include/intr.h      |  3 +--
 sys/arch/newsmips/newsmips/machdep.c  |  9 +++++----
 sys/arch/newsmips/newsmips/news5000.c |  6 ++++--
 6 files changed, 24 insertions(+), 16 deletions(-)

diffs (173 lines):

diff -r e7349ccca1aa -r 1af3d99d0c9f sys/arch/newsmips/apbus/xafb.c
--- a/sys/arch/newsmips/apbus/xafb.c    Thu Jul 21 19:05:03 2016 +0000
+++ b/sys/arch/newsmips/apbus/xafb.c    Thu Jul 21 19:49:58 2016 +0000
@@ -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 @@
 
 #include <uvm/uvm_extern.h>
 
+#include <mips/locore.h>
+
 #include <machine/adrsmap.h>
 #include <machine/apcall.h>
+#include <machine/wsconsio.h>
 
-#include <machine/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 
diff -r e7349ccca1aa -r 1af3d99d0c9f sys/arch/newsmips/dev/scsi_1185.c
--- a/sys/arch/newsmips/dev/scsi_1185.c Thu Jul 21 19:05:03 2016 +0000
+++ b/sys/arch/newsmips/dev/scsi_1185.c Thu Jul 21 19:49:58 2016 +0000
@@ -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 @@
 #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>
diff -r e7349ccca1aa -r 1af3d99d0c9f sys/arch/newsmips/dev/zs_hb.c
--- a/sys/arch/newsmips/dev/zs_hb.c     Thu Jul 21 19:05:03 2016 +0000
+++ b/sys/arch/newsmips/dev/zs_hb.c     Thu Jul 21 19:49:58 2016 +0000
@@ -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 @@
 #include <sys/cpu.h>
 #include <sys/intr.h>
 
+#include <mips/locore.h>
+
 #include <machine/adrsmap.h>
 #include <machine/z8530var.h>
 
diff -r e7349ccca1aa -r 1af3d99d0c9f sys/arch/newsmips/include/intr.h
--- a/sys/arch/newsmips/include/intr.h  Thu Jul 21 19:05:03 2016 +0000
+++ b/sys/arch/newsmips/include/intr.h  Thu Jul 21 19:49:58 2016 +0000
@@ -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;
 
diff -r e7349ccca1aa -r 1af3d99d0c9f sys/arch/newsmips/newsmips/machdep.c
--- a/sys/arch/newsmips/newsmips/machdep.c      Thu Jul 21 19:05:03 2016 +0000
+++ b/sys/arch/newsmips/newsmips/machdep.c      Thu Jul 21 19:49:58 2016 +0000
@@ -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 @@
 
 #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 @@
 #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>
diff -r e7349ccca1aa -r 1af3d99d0c9f sys/arch/newsmips/newsmips/news5000.c
--- a/sys/arch/newsmips/newsmips/news5000.c     Thu Jul 21 19:05:03 2016 +0000
+++ b/sys/arch/newsmips/newsmips/news5000.c     Thu Jul 21 19:49:58 2016 +0000
@@ -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 @@
 #include <sys/cpu.h>
 #include <sys/intr.h>
 
+#include <mips/locore.h>
+
 #include <machine/adrsmap.h>
 
 #include <newsmips/apbus/apbusvar.h>

Prev by Date: [src/trunk]: src/sys/dev/ata Call wd_params_to_properties() after softc is su...
Next by Date: [src/trunk]: src/sys/net Reduce KERNEL_LOCK thereby ifq_lock is used by default.
Previous by Thread: [src/trunk]: src/sys/dev/ata Call wd_params_to_properties() after softc is su...
Next by Thread: [src/trunk]: src/sys/net Reduce KERNEL_LOCK thereby ifq_lock is used by default.
Indexes:

Home | Main Index | Thread Index | Old Index