summaryrefslogtreecommitdiffstats
path: root/sys/arm/mv
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2013-12-13 20:43:11 +0000
committerian <ian@FreeBSD.org>2013-12-13 20:43:11 +0000
commitc44e255e080c7cb566f615f34fd5834c1e626fff (patch)
tree15c6d88c6b74d5b85ad41d55216b3e1c19868c84 /sys/arm/mv
parenta82d470c95dfbb07e973745cfbe6dc42ed1ab8b1 (diff)
downloadFreeBSD-src-c44e255e080c7cb566f615f34fd5834c1e626fff.zip
FreeBSD-src-c44e255e080c7cb566f615f34fd5834c1e626fff.tar.gz
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.
Diffstat (limited to 'sys/arm/mv')
-rw-r--r--sys/arm/mv/mv_machdep.c2
-rw-r--r--sys/arm/mv/mvvar.h1
-rw-r--r--sys/arm/mv/orion/db88f5xxx.c1
-rw-r--r--sys/arm/mv/timer.c1
4 files changed, 0 insertions, 5 deletions
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index 58d183e..54c78bf 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -50,9 +50,7 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <arm/mv/mvreg.h> /* XXX */
#include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */
diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h
index c85539a..754541f 100644
--- a/sys/arm/mv/mvvar.h
+++ b/sys/arm/mv/mvvar.h
@@ -44,7 +44,6 @@
#include <machine/bus.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/vm.h>
#define MV_TYPE_PCI 0
diff --git a/sys/arm/mv/orion/db88f5xxx.c b/sys/arm/mv/orion/db88f5xxx.c
index 5bef2f2..0762df5 100644
--- a/sys/arm/mv/orion/db88f5xxx.c
+++ b/sys/arm/mv/orion/db88f5xxx.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/pte.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <arm/mv/mvreg.h>
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index aec9a34..91305b0 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <sys/watchdog.h>
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/frame.h>
#include <machine/intr.h>
#include <arm/mv/mvreg.h>
OpenPOWER on IntegriCloud