summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/Kconfig
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-10-21 17:46:56 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-10-21 17:46:56 +0200
commitad355e383d826e3506c3caaa0fe991fd112de47b (patch)
tree1f1da23f174f30a2cb1b7d8c2e8b8ace1fd00032 /arch/arm/kvm/Kconfig
parentb10d92a54dac25a6152f1aa1ffc95c12908035ce (diff)
parent0d997491f814c87310a6ad7be30a9049c7150489 (diff)
downloadlinux-ad355e383d826e3506c3caaa0fe991fd112de47b.tar.bz2
Merge tag 'kvm-arm-for-v4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
A late round of KVM/ARM fixes for v4.3-rc7, fixing: - A bug where level-triggered interrupts lowered from userspace are still routed to the guest - A memory leak an a failed initialization path - A build error under certain configurations - Several timer bugs introduced with moving the timer to the active state handling instead of the masking trick.
Diffstat (limited to 'arch/arm/kvm/Kconfig')
-rw-r--r--arch/arm/kvm/Kconfig1
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