MFC r257199, r257200, r257217:

  Remove all #include <machine/pmap.h> from arm code.  It's already
  included by vm/pmap.h, which is a prerequisite for arm/machine/pmap.h
  so there's no reason to ever include it directly.

  Remove #include <machine/frame.h> from all the arm code that doesn't
  really need it.  That would be almost everywhere it was included.  Add
  it in a couple files that really do need it and were previously getting
  it by accident via another header.

  Remove the last dregs of trapframe_t.  It turns out only arm was using
  this type, so remove it to make arm code more consistant with other
  platforms.

6 files changed, 6 insertions, 6 deletions

diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index 9dae977..95779e1 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -5,6 +5,7 @@
 #define MACHINE_CPU_H
 
 #include <machine/armreg.h>
+#include <machine/frame.h>
 
 void	cpu_halt(void);
 void	swi_vm(void *);
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h
index 7285e97..bff86d8 100644
--- a/sys/arm/include/fdt.h
+++ b/sys/arm/include/fdt.h
@@ -38,7 +38,6 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 #include <machine/intr.h>
 
 /* Max interrupt number */
diff --git a/sys/arm/include/frame.h b/sys/arm/include/frame.h
index cd6a897..1e6f43a 100644
--- a/sys/arm/include/frame.h
+++ b/sys/arm/include/frame.h
@@ -59,7 +59,7 @@
  * Trap frame.  Pushed onto the kernel stack on a trap (synchronous exception).
  */
 
-typedef struct trapframe {
+struct trapframe {
 	register_t tf_spsr; /* Zero on arm26 */
 	register_t tf_r0;
 	register_t tf_r1;
@@ -80,7 +80,7 @@ typedef struct trapframe {
 	register_t tf_svc_lr; /* Not used on arm26 */
 	register_t tf_pc;
 	register_t tf_pad;
-} trapframe_t;
+};
 
 /* Register numbers */
 #define tf_r13 tf_usr_sp
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index e6f0a41..8a762aa 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -38,7 +38,6 @@
 #ifndef	_MACHINE_PCB_H_
 #define	_MACHINE_PCB_H_
 
-#include <machine/frame.h>
 #include <machine/fp.h>
 
 
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index 1995030..6e0eb06 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -33,7 +33,6 @@
 #ifdef _KERNEL
 
 #include <machine/cpuconf.h>
-#include <machine/frame.h>
 
 #define	ALT_STACK_SIZE	128
 
diff --git a/sys/arm/include/undefined.h b/sys/arm/include/undefined.h
index 6b64d1d..8a673f4 100644
--- a/sys/arm/include/undefined.h
+++ b/sys/arm/include/undefined.h
@@ -52,7 +52,9 @@
 
 #include <sys/queue.h>
 
-typedef int (*undef_handler_t) (unsigned int, unsigned int, trapframe_t *, int);
+struct trapframe;
+
+typedef int (*undef_handler_t) (unsigned int, unsigned int, struct trapframe *, int);
 
 #define FP_COPROC	1
 #define FP_COPROC2	2