#include <pmax/foo.h> -> #include <machine/foo.h>

14 files changed, 16 insertions, 17 deletions

diff --git a/sys/arch/pmax/dev/bt478.c b/sys/arch/pmax/dev/bt478.c
index 8133423eea3..738e8f92ba8 100644
--- a/sys/arch/pmax/dev/bt478.c
+++ b/sys/arch/pmax/dev/bt478.c
@@ -62,7 +62,7 @@
 #include <sys/device.h>
 #include <sys/select.h>
 
-#include <pmax/cpuregs.h>
+#include <machine/cpuregs.h>
 #include <machine/pmioctl.h>
 
 #include <machine/fbio.h>
diff --git a/sys/arch/pmax/dev/cfb.c b/sys/arch/pmax/dev/cfb.c
index d27602a3aa9..870075c9fbd 100644
--- a/sys/arch/pmax/dev/cfb.c
+++ b/sys/arch/pmax/dev/cfb.c
@@ -93,7 +93,7 @@
 #include <sys/device.h>
 #include <dev/tc/tcvar.h>
 
-#include <pmax/cpuregs.h>		/* mips cached->uncached */
+#include <machine/cpuregs.h>		/* mips cached->uncached */
 #include <machine/pmioctl.h>
 #include <machine/fbio.h>
 #include <machine/fbvar.h>
diff --git a/sys/arch/pmax/dev/dtop.c b/sys/arch/pmax/dev/dtop.c
index 784f03ddea2..f402dabe87f 100644
--- a/sys/arch/pmax/dev/dtop.c
+++ b/sys/arch/pmax/dev/dtop.c
@@ -112,7 +112,7 @@ SOFTWARE.
 
 #include <dev/cons.h>
 
-#include <pmax/cpuregs.h>		/* mips cached->uncached */
+#include <machine/cpuregs.h>		/* mips cached->uncached */
 #include <machine/dc7085cons.h>		/*  mdmctl bits same on dtop and dc? */
 #include <machine/pmioctl.h>
 #include <machine/fbio.h>
diff --git a/sys/arch/pmax/dev/fb.c b/sys/arch/pmax/dev/fb.c
index 0f0bfcc15cb..97f401e2139 100644
--- a/sys/arch/pmax/dev/fb.c
+++ b/sys/arch/pmax/dev/fb.c
@@ -84,7 +84,7 @@
 #include <sys/conf.h>
 #include <machine/conf.h>
 
-#include <pmax/cpuregs.h>		/* mips cached->uncached */
+#include <machine/cpuregs.h>		/* mips cached->uncached */
 #include <machine/pmioctl.h>
 
 #include <machine/fbio.h>
diff --git a/sys/arch/pmax/dev/mfb.c b/sys/arch/pmax/dev/mfb.c
index baa74cdb61a..ac6123a6f67 100644
--- a/sys/arch/pmax/dev/mfb.c
+++ b/sys/arch/pmax/dev/mfb.c
@@ -94,7 +94,7 @@
 #include <dev/tc/tcvar.h>
 #include <machine/autoconf.h>
 
-#include <pmax/cpuregs.h>		/* mips cached->uncached */
+#include <machine/cpuregs.h>		/* mips cached->uncached */
 #include <machine/pmioctl.h>
 #include <machine/fbio.h>
 #include <machine/fbvar.h>
diff --git a/sys/arch/pmax/dev/sfb.c b/sys/arch/pmax/dev/sfb.c
index e0894ed6244..cfb003811df 100644
--- a/sys/arch/pmax/dev/sfb.c
+++ b/sys/arch/pmax/dev/sfb.c
@@ -101,7 +101,7 @@
 #include <pmax/dev/bt459.h>
 #include <pmax/dev/sfbreg.h>
 
-#include <pmax/cpuregs.h>		/* mips cached->uncached */
+#include <machine/cpuregs.h>		/* mips cached->uncached */
 
 #include <pmax/pmax/pmaxtype.h>
 #include <machine/pmioctl.h>
diff --git a/sys/arch/pmax/dev/xcfb.c b/sys/arch/pmax/dev/xcfb.c
index d2f9e6103e1..e51d8d9a1ae 100644
--- a/sys/arch/pmax/dev/xcfb.c
+++ b/sys/arch/pmax/dev/xcfb.c
@@ -105,7 +105,7 @@ xcfb needs dtop device
 #include <sys/device.h>
 #include <dev/tc/tcvar.h>
 #include <machine/autoconf.h>
-#include <pmax/cpuregs.h>		/* mips cached->uncached */
+#include <machine/cpuregs.h>		/* mips cached->uncached */
 
 #include <machine/pmioctl.h>
 #include <machine/fbio.h>
diff --git a/sys/arch/pmax/pmax/locore.S b/sys/arch/pmax/pmax/locore.S
index 65a54e85fe1..39c3a2adc61 100644
--- a/sys/arch/pmax/pmax/locore.S
+++ b/sys/arch/pmax/pmax/locore.S
@@ -61,8 +61,8 @@
 #include <sys/errno.h>
 #include <sys/syscall.h>
 
-#include <pmax/regnum.h>
-#include <pmax/asm.h>
+#include <machine/regnum.h>
+#include <machine/asm.h>
 
 #include <machine/param.h>
 #include <machine/psl.h>
diff --git a/sys/arch/pmax/pmax/locore_machdep.S b/sys/arch/pmax/pmax/locore_machdep.S
index b93d637541c..a38327c390b 100644
--- a/sys/arch/pmax/pmax/locore_machdep.S
+++ b/sys/arch/pmax/pmax/locore_machdep.S
@@ -58,7 +58,7 @@
  * DEcstation-specific mips locore code.
  */
 
-#include <pmax/asm.h>
+#include <machine/asm.h>
 
 	.set	noreorder
 
diff --git a/sys/arch/pmax/pmax/mem.c b/sys/arch/pmax/pmax/mem.c
index b41fb945532..56b21b555ee 100644
--- a/sys/arch/pmax/pmax/mem.c
+++ b/sys/arch/pmax/pmax/mem.c
@@ -52,7 +52,7 @@
 #include <sys/malloc.h>
 #include <sys/msgbuf.h>
 
-#include <pmax/conf.h>
+#include <machine/conf.h>
 #include <machine/cpu.h>
 
 #include <vm/vm.h>
diff --git a/sys/arch/pmax/pmax/mips_machdep.c b/sys/arch/pmax/pmax/mips_machdep.c
index 7540870b44e..5d6d3823fa3 100644
--- a/sys/arch/pmax/pmax/mips_machdep.c
+++ b/sys/arch/pmax/pmax/mips_machdep.c
@@ -16,9 +16,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <pmax/cpu.h>		/* declaration of of cpu_id */
-#include <pmax/locore.h>
 #include <machine/cpu.h>		/* declaration of of cpu_id */
+#include <machine/locore.h>
 
 mips_locore_jumpvec_t mips_locore_jumpvec = {
   NULL, NULL, NULL, NULL,
diff --git a/sys/arch/pmax/pmax/pmap.c b/sys/arch/pmax/pmax/pmap.c
index 2827030e9b5..0d2bedaa6e2 100644
--- a/sys/arch/pmax/pmax/pmap.c
+++ b/sys/arch/pmax/pmax/pmap.c
@@ -79,7 +79,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 
-#include <pmax/cpuregs.h>
+#include <machine/cpuregs.h>
 #include <machine/locore.h>
 #include <machine/pte.h>
 
diff --git a/sys/arch/pmax/pmax/trap.c b/sys/arch/pmax/pmax/trap.c
index 034795b149d..5f22bc4af0b 100644
--- a/sys/arch/pmax/pmax/trap.c
+++ b/sys/arch/pmax/pmax/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.12 1998/03/05 21:18:19 maja Exp $	*/
+/*	$OpenBSD: trap.c,v 1.13 1998/05/09 21:29:58 millert Exp $	*/
 /*	$NetBSD: trap.c,v 1.50 1996/10/13 21:37:49 jonathan Exp $	*/
 
 /*
@@ -61,7 +61,7 @@
 #endif
 #include <net/netisr.h>
 
-#include <pmax/locore.h>
+#include <machine/locore.h>
 
 #include <machine/trap.h>
 #include <machine/psl.h>
diff --git a/sys/arch/pmax/tc/scc.c b/sys/arch/pmax/tc/scc.c
index 79252ac3c1b..4fe4c7c38a4 100644
--- a/sys/arch/pmax/tc/scc.c
+++ b/sys/arch/pmax/tc/scc.c
@@ -100,7 +100,7 @@
 #include <pmax/dev/lk201var.h>
 
 #ifdef pmax
-#include <pmax/cpuregs.h>	/* phys to uncached */
+#include <machine/cpuregs.h>	/* phys to uncached */
 #include <pmax/pmax/cons.h>
 #include <pmax/pmax/pmaxtype.h>
 #include <pmax/pmax/maxine.h>