summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-03-15 21:45:37 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2018-03-15 21:45:37 +0100
commitbb9b4dbe0d6b7eda355cad7c57b36f37fdac6235 (patch)
tree1097028058dfc732ab5b1e19b104c559f62cf588 /arch
parente2c15aff5f353ba80bd3bb49840837f65fa5cc43 (diff)
parent27e91ad1e746e341ca2312f29bccb9736be7b476 (diff)
downloadlinux-bb9b4dbe0d6b7eda355cad7c57b36f37fdac6235.tar.bz2
Merge tag 'kvm-arm-fixes-for-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
kvm/arm fixes for 4.16, take 2 - Peace of mind locking fix in vgic_mmio_read_pending - Allow hw-mapped interrupts to be reset when the VM resets - Fix GICv2 multi-source SGI injection - Fix MMIO synchronization for GICv2 on v3 emulation - Remove excess verbosity on the console
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kvm/guest.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index d7e3299a7734..959e50d2588c 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -363,8 +363,6 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
{
int ret = 0;
- vcpu_load(vcpu);
-
trace_kvm_set_guest_debug(vcpu, dbg->control);
if (dbg->control & ~KVM_GUESTDBG_VALID_MASK) {
@@ -386,7 +384,6 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
}
out:
- vcpu_put(vcpu);
return ret;
}