diff mbox

[kvmtool,3/3] arm/gic: move GICv2M gadget size into private header

Message ID 20180425100945.19171-4-andre.przywara@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andre Przywara April 25, 2018, 10:09 a.m. UTC 
The header files in arm/aarch*/include/asm/ are directly copied from
Linux, so we can't just put our own definitions in there.
Move the GICv2M MMIO frame size into a more private header, to avoid
breaking the build once the header files are synced from Linux.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 arm/aarch32/include/asm/kvm.h | 2 --
 arm/aarch64/include/asm/kvm.h | 2 --
 arm/include/arm-common/gic.h  | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/arm/aarch32/include/asm/kvm.h b/arm/aarch32/include/asm/kvm.h
index 02206673..6ebd3e6a 100644
--- a/arm/aarch32/include/asm/kvm.h
+++ b/arm/aarch32/include/asm/kvm.h
@@ -84,8 +84,6 @@  struct kvm_regs {
 #define KVM_VGIC_V2_DIST_SIZE		0x1000
 #define KVM_VGIC_V2_CPU_SIZE		0x2000
 
-#define KVM_VGIC_V2M_SIZE		0x1000
-
 /* Supported VGICv3 address types  */
 #define KVM_VGIC_V3_ADDR_TYPE_DIST	2
 #define KVM_VGIC_V3_ADDR_TYPE_REDIST	3
diff --git a/arm/aarch64/include/asm/kvm.h b/arm/aarch64/include/asm/kvm.h
index 7d14507b..c2860358 100644
--- a/arm/aarch64/include/asm/kvm.h
+++ b/arm/aarch64/include/asm/kvm.h
@@ -84,8 +84,6 @@  struct kvm_regs {
 #define KVM_VGIC_V2_DIST_SIZE		0x1000
 #define KVM_VGIC_V2_CPU_SIZE		0x2000
 
-#define KVM_VGIC_V2M_SIZE		0x1000
-
 /* Supported VGICv3 address types  */
 #define KVM_VGIC_V3_ADDR_TYPE_DIST	2
 #define KVM_VGIC_V3_ADDR_TYPE_REDIST	3
diff --git a/arm/include/arm-common/gic.h b/arm/include/arm-common/gic.h
index 687effc6..ae253c05 100644
--- a/arm/include/arm-common/gic.h
+++ b/arm/include/arm-common/gic.h
@@ -21,6 +21,8 @@ 
 #define GIC_MAX_CPUS			8
 #define GIC_MAX_IRQ			255
 
+#define KVM_VGIC_V2M_SIZE		0x1000
+
 enum irqchip_type {
 	IRQCHIP_GICV2,
 	IRQCHIP_GICV2M,