diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-23 19:21:59 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 20:06:00 +0100 |
| commit | 967f84275ba74eac696f798ce1a780285170b5e7 (patch) | |
| tree | e8dfd11d9587c0faf1511765e84127ed50b6d6dc /arch/arm/kvm/vgic.c | |
| parent | ARM: KVM: arch_timers: Add timer world switch (diff) | |
| download | linux-967f84275ba74eac696f798ce1a780285170b5e7.tar.xz linux-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/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 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) 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); |