FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-10 05:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KVM: arm/arm64: Avoid attempting to load timer vgic state without a vgic

Browse Source 
The timer optimization patches inadvertendly changed the logic to always
load the timer state as if we have a vgic, even if we don't have a vgic.

Fix this by doing the usual irqchip_in_kernel() check and call the
appropriate load function.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
This commit is contained in:
Christoffer Dall 2017-11-29 17:05:16 +01:00
parent e3feebf817
commit 22601127c0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virt/kvm/arm/arch_timer.c
View File

@ -835,7 +835,10 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu)
no_vgic: no_vgic:
preempt_disable(); preempt_disable();
timer->enabled = 1; timer->enabled = 1;
kvm_timer_vcpu_load_vgic(vcpu); if (!irqchip_in_kernel(vcpu->kvm))
kvm_timer_vcpu_load_user(vcpu);
else
kvm_timer_vcpu_load_vgic(vcpu);
preempt_enable(); preempt_enable();
return 0; return 0;