| Message ID | 20171019124847.5978-2-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 19 Oct 2017, Andre Przywara wrote: > 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> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > xen/arch/arm/domain_build.c | 1 - > xen/arch/arm/p2m.c | 1 - > xen/arch/arm/platforms/vexpress.c | 1 - > xen/arch/arm/platforms/xgene-storm.c | 1 - > xen/arch/arm/time.c | 1 - > xen/arch/arm/traps.c | 1 - > xen/arch/arm/vpsci.c | 1 - > xen/arch/arm/vtimer.c | 1 - > 8 files changed, 8 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index bf29299707..e7899fbf19 100644 > --- 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 68b488997d..07f5cc4468 100644 > --- 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 39b6bcc70e..70839d676f 100644 > --- 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 3b007fe5ed..deb8479a49 100644 > --- 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 105c7410c7..36f640f0c1 100644 > --- 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 f6f6de3691..ff3d6ff2aa 100644 > --- 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 0e024f7578..cd724904ef 100644 > --- 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 3f84893a74..f52a723a5f 100644 > --- 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> > -- > 2.14.1 >
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index bf29299707..e7899fbf19 100644 --- 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 68b488997d..07f5cc4468 100644 --- 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 39b6bcc70e..70839d676f 100644 --- 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 3b007fe5ed..deb8479a49 100644 --- 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 105c7410c7..36f640f0c1 100644 --- 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 f6f6de3691..ff3d6ff2aa 100644 --- 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 0e024f7578..cd724904ef 100644 --- 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 3f84893a74..f52a723a5f 100644 --- 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>
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> --- xen/arch/arm/domain_build.c | 1 - xen/arch/arm/p2m.c | 1 - xen/arch/arm/platforms/vexpress.c | 1 - xen/arch/arm/platforms/xgene-storm.c | 1 - xen/arch/arm/time.c | 1 - xen/arch/arm/traps.c | 1 - xen/arch/arm/vpsci.c | 1 - xen/arch/arm/vtimer.c | 1 - 8 files changed, 8 deletions(-)