diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-12 15:22:31 +0200 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2015-10-20 18:04:49 +0200 |
| commit | 4a5d69b73948d0e03cd38d77dc11edb2e707165f (patch) | |
| tree | 74951e7b5d3408d339d9286b952aa1011b534c13 /arch/arm | |
| parent | 399ea0f6bcd318af94ec8e4ffe96703ed674f22e (diff) | |
| download | linux-stable-4a5d69b73948d0e03cd38d77dc11edb2e707165f.tar.gz linux-stable-4a5d69b73948d0e03cd38d77dc11edb2e707165f.tar.bz2 linux-stable-4a5d69b73948d0e03cd38d77dc11edb2e707165f.zip | |
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: 662d9715840 ("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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kvm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 210eccadb69a..356970f3b25e 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -21,6 +21,7 @@ config KVM depends on MMU && OF select PREEMPT_NOTIFIERS select ANON_INODES + select ARM_GIC select HAVE_KVM_CPU_RELAX_INTERCEPT select HAVE_KVM_ARCH_TLB_FLUSH_ALL select KVM_MMIO |