diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-10 13:01:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-10 13:01:58 +0800 |
| commit | d879d2bd4bcfabb0f4104f7c901e8ae9fd57a21b (patch) | |
| tree | c283726df947d7a09228ba04a0238afe7c27525c /virt | |
| parent | f2363994a726dff665d850042ace77e100a80d4a (diff) | |
| parent | 69b0bf95a51eb4b0890b3979531aed932cf51d7f (diff) | |
Merge tag 'v4.4.105' into linux-linaro-lsk-v4.4
This is the 4.4.105 stable release
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index a7b9022b5c8f..7f38db2a46c8 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -84,9 +84,6 @@ static void kvm_timer_inject_irq_work(struct work_struct *work) struct kvm_vcpu *vcpu; vcpu = container_of(work, struct kvm_vcpu, arch.timer_cpu.expired); - vcpu->arch.timer_cpu.armed = false; - - WARN_ON(!kvm_timer_should_fire(vcpu)); /* * If the vcpu is blocked we want to wake it up so that it will see |