diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 15:04:59 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-01-17 15:04:59 +0100 |
| commit | 1b1973ef9a6a951903c1d7701f0c420b27e77cf3 (patch) | |
| tree | afcfd18b45a7dc163cce3e77a8ee9ec6edf04720 /virt/kvm/arm/vgic/vgic-v2.c | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| parent | 1193e6aeecb36c74c48c7cd0f641acbbed9ddeef (diff) | |
| download | op-kernel-dev-1b1973ef9a6a951903c1d7701f0c420b27e77cf3.zip op-kernel-dev-1b1973ef9a6a951903c1d7701f0c420b27e77cf3.tar.gz | |
Merge tag 'kvm-arm-for-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM updates for 4.10-rc4
- Fix for timer setup on VHE machines
- Drop spurious warning when the timer races against
the vcpu running again
- Prevent a vgic deadlock when the initialization fails
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-v2.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-v2.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c index 9bab867..834137e 100644 --- a/virt/kvm/arm/vgic/vgic-v2.c +++ b/virt/kvm/arm/vgic/vgic-v2.c @@ -293,8 +293,6 @@ int vgic_v2_map_resources(struct kvm *kvm) dist->ready = true; out: - if (ret) - kvm_vgic_destroy(kvm); return ret; } |
