Always include <uvm/uvm_extern.h> before <machine/cmmu.h>.

13 files changed, 43 insertions, 33 deletions

diff --git a/sys/arch/luna88k/luna88k/m8820x.c b/sys/arch/luna88k/luna88k/m8820x.c
index 1c5c17a5149..edc672b5a8e 100644
--- a/sys/arch/luna88k/luna88k/m8820x.c
+++ b/sys/arch/luna88k/luna88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.5 2004/08/06 13:23:47 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.6 2005/04/27 14:07:36 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -84,13 +84,14 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/asm_macro.h>
+#include <machine/board.h>
+#include <machine/cmmu.h>
 #include <machine/cpu_number.h>
 #include <machine/locore.h>
-
-#include <machine/cmmu.h>
 #include <machine/m8820x.h>
-#include <machine/board.h>
 
 /*
  * This routine sets up the CPU/CMMU configuration.
diff --git a/sys/arch/luna88k/luna88k/mainbus.c b/sys/arch/luna88k/luna88k/mainbus.c
index b22851be363..a06ab267e1f 100644
--- a/sys/arch/luna88k/luna88k/mainbus.c
+++ b/sys/arch/luna88k/luna88k/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.4 2004/08/18 13:29:46 aoyama Exp $ */
+/* $OpenBSD: mainbus.c,v 1.5 2005/04/27 14:07:36 miod Exp $ */
 /* $NetBSD: mainbus.c,v 1.2 2000/01/07 05:13:08 nisimura Exp $ */
 
 /*-
@@ -41,6 +41,8 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/autoconf.h>
 #include <machine/board.h>
 #include <machine/cmmu.h>
diff --git a/sys/arch/luna88k/luna88k/pmap_table.c b/sys/arch/luna88k/luna88k/pmap_table.c
index 816db12cdb6..ca0db418392 100644
--- a/sys/arch/luna88k/luna88k/pmap_table.c
+++ b/sys/arch/luna88k/luna88k/pmap_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_table.c,v 1.4 2004/07/25 11:06:41 miod Exp $	*/
+/*	$OpenBSD: pmap_table.c,v 1.5 2005/04/27 14:07:36 miod Exp $	*/
 
 /* 
  * Mach Operating System
@@ -28,9 +28,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+
+#include <uvm/uvm_extern.h>
+
 #include <machine/board.h>
 #include <machine/cmmu.h>
-#include <uvm/uvm_extern.h>
 #include <machine/pmap_table.h>
 
 #define	R	VM_PROT_READ
diff --git a/sys/arch/m88k/m88k/cmmu.c b/sys/arch/m88k/m88k/cmmu.c
index 30f2d82dde3..b38e19e90c4 100644
--- a/sys/arch/m88k/m88k/cmmu.c
+++ b/sys/arch/m88k/m88k/cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.c,v 1.2 2004/08/06 13:23:49 miod Exp $	*/
+/*	$OpenBSD: cmmu.c,v 1.3 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -60,6 +60,9 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/simplelock.h>
+
+#include <uvm/uvm_extern.h>
+
 #include <machine/cmmu.h>
 #include <machine/cpu_number.h>
 
diff --git a/sys/arch/m88k/m88k/m8820x_machdep.c b/sys/arch/m88k/m88k/m8820x_machdep.c
index 2b0c7b7c3f6..a1f7047f951 100644
--- a/sys/arch/m88k/m88k/m8820x_machdep.c
+++ b/sys/arch/m88k/m88k/m8820x_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x_machdep.c,v 1.3 2004/08/08 21:19:18 miod Exp $	*/
+/*	$OpenBSD: m8820x_machdep.c,v 1.4 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -85,15 +85,14 @@
 #include <sys/systm.h>
 #include <sys/simplelock.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/asm_macro.h>
+#include <machine/cmmu.h>
 #include <machine/cpu_number.h>
 #include <machine/locore.h>
-
-#include <machine/cmmu.h>
 #include <machine/m8820x.h>
 
-#include <uvm/uvm_extern.h>
-
 #ifdef DDB
 #include <ddb/db_output.h>		/* db_printf()		*/
 #endif
diff --git a/sys/arch/mvme88k/dev/if_le.c b/sys/arch/mvme88k/dev/if_le.c
index 50fd152a751..6d94a0a68d4 100644
--- a/sys/arch/mvme88k/dev/if_le.c
+++ b/sys/arch/mvme88k/dev/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.10 2004/07/30 19:02:05 miod Exp $ */
+/*	$OpenBSD: if_le.c,v 1.11 2005/04/27 14:07:38 miod Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
@@ -52,7 +52,6 @@
 #include <net/if_media.h>
 
 #include <machine/autoconf.h>
-#include <machine/cmmu.h>
 #include <machine/cpu.h>
 
 #include <dev/ic/am7990reg.h>
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index 5c3ec56f599..dc9576218a4 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.53 2004/09/06 06:25:28 miod Exp $	*/
+/*	$OpenBSD: vs.c,v 1.54 2005/04/27 14:07:38 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -49,18 +49,18 @@
 #include <sys/buf.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
 #include <machine/autoconf.h>
+#include <machine/cmmu.h>
 #include <machine/param.h>
 
 #include <mvme88k/dev/vsreg.h>
 #include <mvme88k/dev/vsvar.h>
 #include <mvme88k/dev/vme.h>
-#include <machine/cmmu.h>
 
 int	vsmatch(struct device *, void *, void *);
 void	vsattach(struct device *, struct device *, void *);
diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c
index 51ffeae0c13..3d8c921e5ea 100644
--- a/sys/arch/mvme88k/mvme88k/m187_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m187_machdep.c,v 1.5 2004/12/24 22:50:30 miod Exp $	*/
+/*	$OpenBSD: m187_machdep.c,v 1.6 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -49,6 +49,8 @@
 #include <sys/kernel.h>
 #include <sys/errno.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/asm_macro.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
@@ -58,8 +60,6 @@
 #include <machine/m88100.h>
 #include <machine/mvme187.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <mvme88k/dev/memcreg.h>
 
 void	m187_bootstrap(void);
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index ab37d4acac9..077a448b844 100644
--- a/sys/arch/mvme88k/mvme88k/m188_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m188_machdep.c,v 1.5 2004/12/24 22:50:30 miod Exp $	*/
+/*	$OpenBSD: m188_machdep.c,v 1.6 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -49,6 +49,8 @@
 #include <sys/kernel.h>
 #include <sys/errno.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/asm_macro.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
@@ -60,8 +62,6 @@
 #include <machine/m88100.h>
 #include <machine/mvme188.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <mvme88k/dev/sysconreg.h>
 
 void	m188_reset(void);
diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c
index 65be66dae30..068ce693362 100644
--- a/sys/arch/mvme88k/mvme88k/m197_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_machdep.c,v 1.5 2004/12/24 22:50:30 miod Exp $	*/
+/*	$OpenBSD: m197_machdep.c,v 1.6 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -49,6 +49,8 @@
 #include <sys/kernel.h>
 #include <sys/errno.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/asm_macro.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
@@ -57,8 +59,6 @@
 #include <machine/trap.h>
 #include <machine/mvme197.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <mvme88k/dev/busswreg.h>
 
 void	m197_bootstrap(void);
diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c
index a4e7d09fd79..c35872fad79 100644
--- a/sys/arch/mvme88k/mvme88k/m88110.c
+++ b/sys/arch/mvme88k/mvme88k/m88110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.c,v 1.18 2004/08/04 15:54:38 miod Exp $	*/
+/*	$OpenBSD: m88110.c,v 1.19 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * All rights reserved.
@@ -62,6 +62,8 @@
 #include <sys/systm.h>
 #include <sys/simplelock.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/cpu_number.h>
 #include <machine/cmmu.h>
 #include <machine/m88110.h>
@@ -69,8 +71,6 @@
 #include <machine/locore.h>
 #include <machine/trap.h>
 
-#include <uvm/uvm_extern.h>
-
 #ifdef DEBUG
 #define DB_CMMU		0x4000	/* MMU debug */
 unsigned int debuglevel = 0;
diff --git a/sys/arch/mvme88k/mvme88k/m8820x.c b/sys/arch/mvme88k/mvme88k/m8820x.c
index 1826ceca224..82e88b0edb7 100644
--- a/sys/arch/mvme88k/mvme88k/m8820x.c
+++ b/sys/arch/mvme88k/mvme88k/m8820x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.c,v 1.40 2004/09/30 21:46:38 miod Exp $	*/
+/*	$OpenBSD: m8820x.c,v 1.41 2005/04/27 14:07:38 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -27,6 +27,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/asm_macro.h>
 #include <machine/cpu_number.h>
 #ifdef DEBUG
diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c
index 0ba50d31f17..a3ae7df9ff0 100644
--- a/sys/arch/mvme88k/mvme88k/pmap_table.c
+++ b/sys/arch/mvme88k/mvme88k/pmap_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_table.c,v 1.20 2004/08/02 08:35:00 miod Exp $	*/
+/*	$OpenBSD: pmap_table.c,v 1.21 2005/04/27 14:07:38 miod Exp $	*/
 
 /*
  * Mach Operating System
@@ -28,8 +28,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <machine/cmmu.h>
+
 #include <uvm/uvm_extern.h>
+
+#include <machine/cmmu.h>
 #include <machine/pmap_table.h>
 
 #define	R	VM_PROT_READ