diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-23 13:21:59 -0500 |
|---|---|---|
| committer | Christoffer Dall <c.dall@virtualopensystems.com> | 2013-01-23 13:21:59 -0500 |
| commit | 4dcab3d7274d8ff5ee6822c68e49589109d865dc (patch) | |
| tree | 72ea4e77807e46ab4128825c08e8be8d21a9b2b8 /arch/arm/kvm/vgic.c | |
| parent | 38e32673a55e9f7685f163c96f2168123e5e9b9a (diff) | |
ARM: KVM: arch_timers: Wire the init code and config optiontracking-kvm-arm-v17-llct-20130308.0tracking-kvm-arm-v17-llct-20130220.0tracking-kvm-arm-v17-llct-20130219.0tracking-kvm-arm-v17-llct-20130217.0tracking-kvm-arm-v17-llct-20130211.0
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: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Diffstat (limited to 'arch/arm/kvm/vgic.c')
| -rw-r--r-- | arch/arm/kvm/vgic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c index 519cde1c983a..c451bf07fb43 100644 --- a/arch/arm/kvm/vgic.c +++ b/arch/arm/kvm/vgic.c @@ -1417,6 +1417,7 @@ int kvm_vgic_init(struct kvm *kvm) for (i = VGIC_NR_PRIVATE_IRQS; i < VGIC_NR_IRQS; i += 4) vgic_set_target_reg(kvm, 0, i); + kvm_timer_init(kvm); kvm->arch.vgic.ready = true; out: mutex_unlock(&kvm->lock); |