aboutsummaryrefslogtreecommitdiffstats
path: root/include/kvm/arm_vgic.h
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2015-11-23 07:20:05 -0800
committerChristoffer Dall <christoffer.dall@linaro.org>2016-05-20 15:39:45 +0200
commitb18b57787f5e469b2825784ae3c522fc14472e97 (patch)
tree300a69cac50e9f407b14cb29dee3d70e68049105 /include/kvm/arm_vgic.h
parentKVM: arm/arm64: move GICv2 emulation defines into arm-gic-v3.h (diff)
downloadlinux-dev-b18b57787f5e469b2825784ae3c522fc14472e97.tar.xz
linux-dev-b18b57787f5e469b2825784ae3c522fc14472e97.zip
KVM: arm/arm64: vgic-new: Add data structure definitions
Add a new header file for the new and improved GIC implementation. The big change is that we now have a struct vgic_irq per IRQ instead of spreading all the information over various bitmaps. We include this new header conditionally from within the old header file for the time being to avoid touching all the users. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'include/kvm/arm_vgic.h')
-rw-r--r--include/kvm/arm_vgic.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index ade70056cbd6..da0a524802cb 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -19,6 +19,10 @@
#ifndef __ASM_ARM_KVM_VGIC_H
#define __ASM_ARM_KVM_VGIC_H
+#ifdef CONFIG_KVM_NEW_VGIC
+#include <kvm/vgic/vgic.h>
+#else
+
#include <linux/kernel.h>
#include <linux/kvm.h>
#include <linux/irqreturn.h>
@@ -367,4 +371,5 @@ static inline int vgic_v3_probe(const struct gic_kvm_info *gic_kvm_info,
}
#endif
+#endif /* old VGIC include */
#endif