aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/vgic.c
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 14:06:00 -0500
commit967f84275ba74eac696f798ce1a780285170b5e7 (patch)
treee8dfd11d9587c0faf1511765e84127ed50b6d6dc /arch/arm/kvm/vgic.c
parentc7e3ba64ba16eddfbfc66ec099860f40e808e124 (diff)
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/vgic.c')
-rw-r--r--arch/arm/kvm/vgic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c
index 6d8407672dec..c9a17316e9fe 100644
--- a/arch/arm/kvm/vgic.c
+++ b/arch/arm/kvm/vgic.c
@@ -1418,6 +1418,7 @@ int kvm_vgic_init(struct kvm *kvm)
1418 for (i = VGIC_NR_PRIVATE_IRQS; i < VGIC_NR_IRQS; i += 4) 1418 for (i = VGIC_NR_PRIVATE_IRQS; i < VGIC_NR_IRQS; i += 4)
1419 vgic_set_target_reg(kvm, 0, i); 1419 vgic_set_target_reg(kvm, 0, i);
1420 1420
1421 kvm_timer_init(kvm);
1421 kvm->arch.vgic.ready = true; 1422 kvm->arch.vgic.ready = true;
1422out: 1423out:
1423 mutex_unlock(&kvm->lock); 1424 mutex_unlock(&kvm->lock);