summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2016-01-22 16:35:01 +0000
committerandrew <andrew@FreeBSD.org>2016-01-22 16:35:01 +0000
commit8bab59d4a5d707c4aab3ce2640da2f84cd78db0e (patch)
treef46b608752f959d86da84afc6cd12b1ce44e01e5
parent9f447408886f7f925c166c56e4be8c30839813bc (diff)
downloadFreeBSD-src-8bab59d4a5d707c4aab3ce2640da2f84cd78db0e.zip
FreeBSD-src-8bab59d4a5d707c4aab3ce2640da2f84cd78db0e.tar.gz
Stop including fdt_common.h in the arm64 code. We don't use anything from
it, however may have relied on header pollution to pull in the needed headers through it Sponsored by: ABT Systems Ltd
-rw-r--r--sys/arm64/arm64/gic_fdt.c4
-rw-r--r--sys/arm64/arm64/gic_v3_fdt.c2
-rw-r--r--sys/arm64/arm64/machdep.c1
-rw-r--r--sys/arm64/arm64/nexus.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/sys/arm64/arm64/gic_fdt.c b/sys/arm64/arm64/gic_fdt.c
index a4c4e25..5160e5f 100644
--- a/sys/arm64/arm64/gic_fdt.c
+++ b/sys/arm64/arm64/gic_fdt.c
@@ -30,7 +30,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/module.h>
@@ -38,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c
index 33164cb..10bc524 100644
--- a/sys/arm64/arm64/gic_v3_fdt.c
+++ b/sys/arm64/arm64/gic_v3_fdt.c
@@ -31,13 +31,13 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <machine/resource.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c
index f256260..0e61817b 100644
--- a/sys/arm64/arm64/machdep.c
+++ b/sys/arm64/arm64/machdep.c
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
#endif
#ifdef FDT
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#endif
diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c
index 807993b..ec1fe84 100644
--- a/sys/arm64/arm64/nexus.c
+++ b/sys/arm64/arm64/nexus.c
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
#include "opt_platform.h"
#ifdef FDT
-#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
#include "ofw_bus_if.h"
#endif
#ifdef DEV_ACPI
OpenPOWER on IntegriCloud