[src/trunk]: src/sys/arch untangle includes a bit:

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

details:   https://anonhg.NetBSD.org/src/rev/cd64b0973fa5
branches:  trunk
changeset: 538736:cd64b0973fa5
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Oct 28 00:55:13 2002 +0000

description:
untangle includes a bit:
don't include cpu.h in pmap.h, nor cacheops.h in cpu.h.  instead,
include cpu.h and cacheops.h in just those .c files that need them.

diffstat:

 sys/arch/mac68k/include/cpu.h        |  3 +--
 sys/arch/mac68k/include/pmap.h       |  3 +--
 sys/arch/mac68k/mac68k/bus_space.c   |  4 +++-
 sys/arch/mac68k/mac68k/machdep.c     |  4 +++-
 sys/arch/mac68k/mac68k/pmap.c        |  6 +++---
 sys/arch/mac68k/mac68k/sys_machdep.c |  3 ++-
 sys/arch/mac68k/mac68k/trap.c        |  3 ++-
 sys/arch/news68k/include/pmap.h      |  3 +--
 sys/arch/x68k/include/cpu.h          |  3 +--
 sys/arch/x68k/include/pmap.h         |  3 +--
 sys/arch/x68k/x68k/machdep.c         |  3 ++-
 sys/arch/x68k/x68k/pmap.c            |  6 +++---
 sys/arch/x68k/x68k/sys_machdep.c     |  3 ++-
 sys/arch/x68k/x68k/trap.c            |  3 ++-
 14 files changed, 27 insertions(+), 23 deletions(-)

diffs (252 lines):

diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/include/cpu.h
--- a/sys/arch/mac68k/include/cpu.h     Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/include/cpu.h     Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.70 2002/04/10 04:38:49 briggs Exp $  */
+/*     $NetBSD: cpu.h,v 1.71 2002/10/28 00:55:13 chs Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -77,7 +77,6 @@
  */
 #include <m68k/cpu.h>
 #define        M68K_MMU_MOTOROLA
-#include <m68k/cacheops.h>
 
 /*
  * Get interrupt glue.
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/include/pmap.h
--- a/sys/arch/mac68k/include/pmap.h    Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/include/pmap.h    Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.35 2002/09/22 07:53:45 chs Exp $    */
+/*     $NetBSD: pmap.h,v 1.36 2002/10/28 00:55:14 chs Exp $    */
 
 /*
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -77,7 +77,6 @@
 #ifndef        _PMAP_MACHINE_
 #define        _PMAP_MACHINE_
 
-#include <machine/cpu.h>
 #include <machine/pte.h>
 
 #if defined(M68040)
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/mac68k/bus_space.c
--- a/sys/arch/mac68k/mac68k/bus_space.c        Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/mac68k/bus_space.c        Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_space.c,v 1.21 2002/09/27 15:36:17 provos Exp $    */
+/*     $NetBSD: bus_space.c,v 1.22 2002/10/28 00:55:14 chs Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -46,6 +46,8 @@
 #include <sys/extent.h>
 
 #include <machine/bus.h>
+#include <machine/cpu.h>
+#include <m68k/cacheops.h>
 
 #include <uvm/uvm_extern.h>
 
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/mac68k/machdep.c
--- a/sys/arch/mac68k/mac68k/machdep.c  Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/mac68k/machdep.c  Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.280 2002/09/19 10:38:02 ragge Exp $      */
+/*     $NetBSD: machdep.c,v 1.281 2002/10/28 00:55:15 chs Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -112,6 +112,8 @@
 #define ELFSIZE 32
 #include <sys/exec_elf.h>
 
+#include <m68k/cacheops.h>
+
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/mac68k/pmap.c
--- a/sys/arch/mac68k/mac68k/pmap.c     Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/mac68k/pmap.c     Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.89 2002/10/14 05:18:50 chs Exp $    */
+/*     $NetBSD: pmap.c,v 1.90 2002/10/28 00:55:16 chs Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -136,11 +136,11 @@
 #include <sys/user.h>
 #include <sys/pool.h>
 
-#include <machine/pte.h>
-
 #include <uvm/uvm.h>
 
+#include <m68k/cacheops.h>
 #include <machine/cpu.h>
+#include <machine/pte.h>
 
 #ifdef DEBUG
 #define PDB_FOLLOW     0x0001
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/mac68k/sys_machdep.c
--- a/sys/arch/mac68k/mac68k/sys_machdep.c      Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/mac68k/sys_machdep.c      Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_machdep.c,v 1.18 2000/12/13 18:13:08 jdolecek Exp $        */
+/*     $NetBSD: sys_machdep.c,v 1.19 2002/10/28 00:55:16 chs Exp $     */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -84,6 +84,7 @@
 
 #include <sys/syscallargs.h>
 
+#include <m68k/cacheops.h>
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/mac68k/mac68k/trap.c
--- a/sys/arch/mac68k/mac68k/trap.c     Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/mac68k/mac68k/trap.c     Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.98 2002/09/27 15:36:20 provos Exp $ */
+/*     $NetBSD: trap.c,v 1.99 2002/10/28 00:55:16 chs Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -64,6 +64,7 @@
 #include <dev/cons.h>
 #endif
 
+#include <m68k/cacheops.h>
 #include <machine/db_machdep.h>
 #include <machine/psl.h>
 #include <machine/trap.h>
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/news68k/include/pmap.h
--- a/sys/arch/news68k/include/pmap.h   Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/news68k/include/pmap.h   Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.12 2002/09/22 07:53:46 chs Exp $    */
+/*     $NetBSD: pmap.h,v 1.13 2002/10/28 00:55:17 chs Exp $    */
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -43,7 +43,6 @@
 #ifndef        _NEWS68K_PMAP_H_
 #define        _NEWS68K_PMAP_H_
 
-#include <machine/cpu.h>
 #include <machine/pte.h>
 
 /*
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/x68k/include/cpu.h
--- a/sys/arch/x68k/include/cpu.h       Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/x68k/include/cpu.h       Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.26 2001/05/30 12:28:52 mrg Exp $     */
+/*     $NetBSD: cpu.h,v 1.27 2002/10/28 00:55:17 chs Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -58,7 +58,6 @@
  * Get common m68k CPU definitions.
  */
 #include <m68k/cpu.h>
-#include <m68k/cacheops.h>
 #define        M68K_MMU_MOTOROLA
 
 /*
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/x68k/include/pmap.h
--- a/sys/arch/x68k/include/pmap.h      Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/x68k/include/pmap.h      Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.25 2002/09/22 07:53:51 chs Exp $    */
+/*     $NetBSD: pmap.h,v 1.26 2002/10/28 00:55:17 chs Exp $    */
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -43,7 +43,6 @@
 #ifndef        _X68K_PMAP_H_
 #define        _X68K_PMAP_H_
 
-#include <machine/cpu.h>
 #include <machine/pte.h>
 
 #if defined(M68040) || defined(M68060)
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/x68k/x68k/machdep.c
--- a/sys/arch/x68k/x68k/machdep.c      Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/x68k/x68k/machdep.c      Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.109 2002/09/25 22:21:31 thorpej Exp $    */
+/*     $NetBSD: machdep.c,v 1.110 2002/10/28 00:55:18 chs Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -85,6 +85,7 @@
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 
+#include <m68k/cacheops.h>
 #include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/psl.h>
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/x68k/x68k/pmap.c
--- a/sys/arch/x68k/x68k/pmap.c Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/x68k/x68k/pmap.c Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.79 2002/10/14 05:18:55 chs Exp $    */
+/*     $NetBSD: pmap.c,v 1.80 2002/10/28 00:55:18 chs Exp $    */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -139,11 +139,11 @@
 #include <sys/user.h>
 #include <sys/pool.h>
 
-#include <machine/pte.h>
-
 #include <uvm/uvm.h>
 
+#include <m68k/cacheops.h>
 #include <machine/cpu.h>
+#include <machine/pte.h>
 
 #ifdef DEBUG
 #define PDB_FOLLOW     0x0001
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/x68k/x68k/sys_machdep.c
--- a/sys/arch/x68k/x68k/sys_machdep.c  Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/x68k/x68k/sys_machdep.c  Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_machdep.c,v 1.24 2001/12/19 14:53:26 minoura Exp $ */
+/*     $NetBSD: sys_machdep.c,v 1.25 2002/10/28 00:55:19 chs Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -53,6 +53,7 @@
 
 #include <sys/syscallargs.h>
 
+#include <m68k/cacheops.h>
 #include <machine/cpu.h>
 
 /* XXX should be in an include file somewhere */
diff -r 1d1869813750 -r cd64b0973fa5 sys/arch/x68k/x68k/trap.c
--- a/sys/arch/x68k/x68k/trap.c Sun Oct 27 23:23:48 2002 +0000
+++ b/sys/arch/x68k/x68k/trap.c Mon Oct 28 00:55:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.58 2002/02/14 07:08:19 chs Exp $    */
+/*     $NetBSD: trap.c,v 1.59 2002/10/28 00:55:19 chs Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -66,6 +66,7 @@
 #include <machine/cpu.h>
 #include <machine/reg.h>
 #include <machine/db_machdep.h>
+#include <m68k/cacheops.h>
 
 #include <uvm/uvm_extern.h>