ARM: remove unneeded gic.h inclusions

gic.h is supposed to hold defines and prototypes for the hardware side
of the GIC interrupt controller. A lot of parts in Xen should not be
bothered with that, as they either only care about the VGIC or use
more generic interfaces.
Remove unneeded inclusions of gic.h from files where they are actually
not needed.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index c74f4dd69d6b9667ceba129a259ea1bbcaea7a80..51e5c8d9f46d03b23dc23265cb2ffda6e4a20ed2 100644 (file)
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -21,7 +21,6 @@
 #include <asm/setup.h>
 #include <asm/cpufeature.h>
 
-#include <asm/gic.h>
 #include <xen/irq.h>
 #include <xen/grant_table.h>
 #include "kernel.h"

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 417609ede2d2473ec76caf7b7d3ef5d29c22a132..7bf34aaa8c420384307ef3a4ea26cb0de2d28e16 100644 (file)
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -10,7 +10,6 @@
 #include <xen/xmalloc.h>
 #include <public/vm_event.h>
 #include <asm/flushtlb.h>
-#include <asm/gic.h>
 #include <asm/event.h>
 #include <asm/hardirq.h>
 #include <asm/page.h>

diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c
index 39b6bcc70ed1103b99cc9959fee7cbbadeaa6fe7..70839d676fc630d4ccee72af1d56602826db3397 100644 (file)
--- a/xen/arch/arm/platforms/vexpress.c
+++ b/xen/arch/arm/platforms/vexpress.c
@@ -22,7 +22,6 @@
 #include <xen/mm.h>
 #include <xen/vmap.h>
 #include <asm/io.h>
-#include <asm/gic.h>
 
 #define DCC_SHIFT      26
 #define FUNCTION_SHIFT 20

diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c
index 3b007fe5edaa8bedd64b20a7fa9623758dc99ea0..deb8479a49bc6f1169425913967f964556d03e11 100644 (file)
--- a/xen/arch/arm/platforms/xgene-storm.c
+++ b/xen/arch/arm/platforms/xgene-storm.c
@@ -22,7 +22,6 @@
 #include <xen/vmap.h>
 #include <xen/device_tree.h>
 #include <asm/io.h>
-#include <asm/gic.h>
 
 /* XGENE RESET Specific defines */
 #define XGENE_RESET_ADDR        0x17000014UL

diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 105c7410c75bf56aec1d0d9306c5911a4f900e11..36f640f0c13ebce3caf331c6500ca63eb3f6e474 100644 (file)
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -31,7 +31,6 @@
 #include <xen/acpi.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/gic.h>
 #include <asm/vgic.h>
 #include <asm/cpufeature.h>
 #include <asm/platform.h>

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index f6f6de3691af3d9d8069150828444b3800153df8..ff3d6ff2aa8cd013046cf28743d51aea483cb2bc 100644 (file)
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -43,7 +43,6 @@
 #include <asm/debugger.h>
 #include <asm/event.h>
 #include <asm/flushtlb.h>
-#include <asm/gic.h>
 #include <asm/mmio.h>
 #include <asm/monitor.h>
 #include <asm/psci.h>

diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c
index 0e024f7578ba491f2c671702f42b4189edea7567..cd724904ef1789952c5907dc9a2da7faebe13a6e 100644 (file)
--- a/xen/arch/arm/vpsci.c
+++ b/xen/arch/arm/vpsci.c
@@ -15,7 +15,6 @@
 #include <xen/types.h>
 
 #include <asm/current.h>
-#include <asm/gic.h>
 #include <asm/vgic.h>
 #include <asm/psci.h>
 #include <asm/event.h>

diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index 3f84893a74cb74c78ad8775a885d691079a104fc..f52a723a5f1e059bb0ddba699c40de85fcee2aec 100644 (file)
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -24,7 +24,6 @@
 
 #include <asm/cpregs.h>
 #include <asm/div64.h>
-#include <asm/gic.h>
 #include <asm/irq.h>
 #include <asm/regs.h>
 #include <asm/time.h>