Commit f9af7b5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fix from Paolo Bonzini:

 - Fix cleanup mistake (probably a cut-and-paste error) in a Xen
   hypercall

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86/xen: Fix cleanup logic in emulation of Xen schedop poll hypercalls
parents 01a412d0 5a53249d

arch/x86/kvm/xen.c

+1 −1
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ static bool kvm_xen_schedop_poll(struct kvm_vcpu *vcpu, bool longmode, 
	if (kvm_read_guest_virt(vcpu, (gva_t)sched_poll.ports, ports,

				sched_poll.nr_ports * sizeof(*ports), &e)) {

		*r = -EFAULT;

		return true;

		goto out;

	}



	for (i = 0; i < sched_poll.nr_ports; i++) {