]> git.baikalelectronics.ru Git - kernel.git/commit
KVM: arm: use GIC support unconditionally
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Oct 2015 13:22:31 +0000 (15:22 +0200)
committerChristoffer Dall <christoffer.dall@linaro.org>
Tue, 20 Oct 2015 16:04:49 +0000 (18:04 +0200)
commit05c336dc0517b5a957455030243ac76e18d547d5
tree74951e7b5d3408d339d9286b952aa1011b534c13
parent1e96bcf19d6f236374b52d6148f696f97e73b265
KVM: arm: use GIC support unconditionally

The vgic code on ARM is built for all configurations that enable KVM,
but the parent_data field that it references is only present when
CONFIG_IRQ_DOMAIN_HIERARCHY is set:

virt/kvm/arm/vgic.c: In function 'kvm_vgic_map_phys_irq':
virt/kvm/arm/vgic.c:1781:13: error: 'struct irq_data' has no member named 'parent_data'

This flag is implied by the GIC driver, and indeed the VGIC code only
makes sense if a GIC is present. This changes the CONFIG_KVM symbol
to always select GIC, which avoids the issue.

Fixes: 4e34fcaff59 ("arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER}")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
arch/arm/kvm/Kconfig