diff options
author | Marc Zyngier <maz@kernel.org> | 2020-03-24 13:43:47 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-03-24 13:43:47 +0100 |
commit | 771df8cf0bc3a9a94bc16a58da136cad186cea27 (patch) | |
tree | d2d70780f396588e6ad3d811343e15b9ffd513e4 /include/kvm | |
parent | irqchip/stm32: Retrigger both in eoi and unmask callbacks (diff) | |
parent | irqchip/gic-v4.1: Eagerly vmap vPEs (diff) | |
download | linux-771df8cf0bc3a9a94bc16a58da136cad186cea27.tar.xz linux-771df8cf0bc3a9a94bc16a58da136cad186cea27.zip |
Merge branch 'irq/gic-v4.1' into irq/irqchip-next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include/kvm')
-rw-r--r-- | include/kvm/arm_vgic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 9d53f545a3d5..63457908c9c4 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -70,6 +70,7 @@ struct vgic_global { /* Hardware has GICv4? */ bool has_gicv4; + bool has_gicv4_1; /* GIC system register CPU interface */ struct static_key_false gicv3_cpuif; |