svn commit: r294572 - head/sys/arm64/arm64

Andrew Turner andrew at FreeBSD.org
Fri Jan 22 16:35:03 UTC 2016


Author: andrew
Date: Fri Jan 22 16:35:01 2016
New Revision: 294572
URL: https://svnweb.freebsd.org/changeset/base/294572

Log:
  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

Modified:
  head/sys/arm64/arm64/gic_fdt.c
  head/sys/arm64/arm64/gic_v3_fdt.c
  head/sys/arm64/arm64/machdep.c
  head/sys/arm64/arm64/nexus.c

Modified: head/sys/arm64/arm64/gic_fdt.c
==============================================================================
--- head/sys/arm64/arm64/gic_fdt.c	Fri Jan 22 16:32:22 2016	(r294571)
+++ head/sys/arm64/arm64/gic_fdt.c	Fri Jan 22 16:35:01 2016	(r294572)
@@ -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>

Modified: head/sys/arm64/arm64/gic_v3_fdt.c
==============================================================================
--- head/sys/arm64/arm64/gic_v3_fdt.c	Fri Jan 22 16:32:22 2016	(r294571)
+++ head/sys/arm64/arm64/gic_v3_fdt.c	Fri Jan 22 16:35:01 2016	(r294572)
@@ -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>

Modified: head/sys/arm64/arm64/machdep.c
==============================================================================
--- head/sys/arm64/arm64/machdep.c	Fri Jan 22 16:32:22 2016	(r294571)
+++ head/sys/arm64/arm64/machdep.c	Fri Jan 22 16:35:01 2016	(r294572)
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #ifdef FDT
-#include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
 #endif
 

Modified: head/sys/arm64/arm64/nexus.c
==============================================================================
--- head/sys/arm64/arm64/nexus.c	Fri Jan 22 16:32:22 2016	(r294571)
+++ head/sys/arm64/arm64/nexus.c	Fri Jan 22 16:35:01 2016	(r294572)
@@ -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


More information about the svn-src-all mailing list