diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2014-06-23 13:59:13 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-08-12 11:28:26 +0100 |
| commit | f120cd6533d21075ab103ae6c225b1697853660d (patch) | |
| tree | 1b1cd6e41c196c3aa3d5fdfde0d6e37b6c810d8e /arch/arm64 | |
| parent | 773299a570725d1f253d6046cd6475209b0dcd55 (diff) | |
| download | blackbird-op-linux-f120cd6533d21075ab103ae6c225b1697853660d.tar.gz blackbird-op-linux-f120cd6533d21075ab103ae6c225b1697853660d.zip | |
KVM: arm/arm64: timer: Allow the timer to control the active state
In order to remove the crude hack where we sneak the masked bit
into the timer's control register, make use of the phys_irq_map
API control the active state of the interrupt.
This causes some limited changes to allow for potential error
propagation.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kvm/reset.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index b4af6185713f..91cf5350b328 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -121,7 +121,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) kvm_reset_sys_regs(vcpu); /* Reset timer */ - kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq); - - return 0; + return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq); } |
