lkml.org 
[lkml]   [2015]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 18/86] KVM: arm: use GIC support unconditionally
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 4a5d69b73948d0e03cd38d77dc11edb2e707165f upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/kvm/Kconfig | 1 +
    1 file changed, 1 insertion(+)

    --- 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



    \
     
     \ /
      Last update: 2015-11-06 22:01    [W:2.250 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site