aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/Kconfig
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2013-01-23 13:21:59 -0500
committerMarc Zyngier <marc.zyngier@arm.com>2013-02-11 19:06:00 +0000
commit967f84275ba74eac696f798ce1a780285170b5e7 (patch)
treee8dfd11d9587c0faf1511765e84127ed50b6d6dc /arch/arm/kvm/Kconfig
parentARM: KVM: arch_timers: Add timer world switch (diff)
downloadlinux-dev-967f84275ba74eac696f798ce1a780285170b5e7.tar.xz
linux-dev-967f84275ba74eac696f798ce1a780285170b5e7.zip
ARM: KVM: arch_timers: Wire the init code and config option
It is now possible to select CONFIG_KVM_ARM_TIMER to enable the KVM architected timer support. Reviewed-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm/Kconfig')
-rw-r--r--arch/arm/kvm/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index d8126f2b9442..49dd64e579c2 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -59,6 +59,14 @@ config KVM_ARM_VGIC
---help---
Adds support for a hardware assisted, in-kernel GIC emulation.
+config KVM_ARM_TIMER
+ bool "KVM support for Architected Timers"
+ depends on KVM_ARM_VGIC && ARM_ARCH_TIMER
+ select HAVE_KVM_IRQCHIP
+ default y
+ ---help---
+ Adds support for the Architected Timers in virtual machines
+
source drivers/virtio/Kconfig
endif # VIRTUALIZATION