[Xen-changelog] [xen staging] xen/arm: Only include vreg.h when necessary

[p***@xen.org]

commit 188acf6108f0f31a96422fac703c8a00438ea616
Author: Julien Grall <***@arm.com>
AuthorDate: Wed Oct 31 18:13:05 2018 +0000
Commit: Stefano Stabellini <***@kernel.org>
CommitDate: Fri Nov 9 10:14:38 2018 -0800

xen/arm: Only include vreg.h when necessary

Signed-off-by: Julien Grall <***@arm.com>
Reviewed-by: Andrii Anisov <***@epam.com>
Acked-by: Stefano Stabellini <***@kernel.org>
---
xen/arch/arm/vgic-v2.c | 1 +
xen/arch/arm/vgic-v3-its.c | 1 +
xen/arch/arm/vpl011.c | 1 +
xen/include/asm-arm/vgic.h | 1 -
xen/include/asm-arm/vpl011.h | 1 -
5 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c
index 0099fcffda..bf77899dba 100644
--- a/xen/arch/arm/vgic-v2.c
+++ b/xen/arch/arm/vgic-v2.c
@@ -31,6 +31,7 @@
#include <asm/platform.h>
#include <asm/vgic.h>
#include <asm/vgic-emul.h>
+#include <asm/vreg.h>

static struct {
bool enabled;
diff --git a/xen/arch/arm/vgic-v3-its.c b/xen/arch/arm/vgic-v3-its.c
index 9edd97c4e7..5b73c4ecd7 100644
--- a/xen/arch/arm/vgic-v3-its.c
+++ b/xen/arch/arm/vgic-v3-its.c
@@ -45,6 +45,7 @@
#include <asm/gic_v3_its.h>
#include <asm/vgic.h>
#include <asm/vgic-emul.h>
+#include <asm/vreg.h>

/*
* Data structure to describe a virtual ITS.
diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c
index a281eabd7e..117e41c760 100644
--- a/xen/arch/arm/vpl011.c
+++ b/xen/arch/arm/vpl011.c
@@ -33,6 +33,7 @@
#include <asm/pl011-uart.h>
#include <asm/vgic-emul.h>
#include <asm/vpl011.h>
+#include <asm/vreg.h>

/*
* Since pl011 registers are 32-bit registers, all registers
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 374fdaa40d..760392f9ef 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -27,7 +27,6 @@
#include <xen/rbtree.h>
#include <asm/gic.h>
#include <asm/mmio.h>
-#include <asm/vreg.h>

struct pending_irq
{
diff --git a/xen/include/asm-arm/vpl011.h b/xen/include/asm-arm/vpl011.h
index db95ff822f..a82869a53c 100644
--- a/xen/include/asm-arm/vpl011.h
+++ b/xen/include/asm-arm/vpl011.h
@@ -21,7 +21,6 @@

#include <public/domctl.h>
#include <public/io/ring.h>
-#include <asm/vreg.h>
#include <xen/mm.h>

/* helper macros */
--
generated by git-patchbot for /home/xen/git/xen.git#staging