Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d11df7a authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity
Browse files

KVM: s390: Fix vcpu_load handling in interrupt code 



Recent changes (KVM: make processes waiting on vcpu mutex killable)
now requires to check the return value of vcpu_load. This triggered
a warning in s390 specific kvm code. Turns out that we can actually
remove the put/load, since schedule will do the right thing via
the preempt notifiers.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c8639010

arch/s390/kvm/interrupt.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -423,9 +423,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) 
		set_current_state(TASK_INTERRUPTIBLE);

		set_current_state(TASK_INTERRUPTIBLE);

		spin_unlock_bh(&vcpu->arch.local_int.lock);

		spin_unlock_bh(&vcpu->arch.local_int.lock);

		spin_unlock(&vcpu->arch.local_int.float_int->lock);

		spin_unlock(&vcpu->arch.local_int.float_int->lock);

		vcpu_put(vcpu);

		schedule();

		schedule();

		vcpu_load(vcpu);

		spin_lock(&vcpu->arch.local_int.float_int->lock);

		spin_lock(&vcpu->arch.local_int.float_int->lock);

		spin_lock_bh(&vcpu->arch.local_int.lock);

		spin_lock_bh(&vcpu->arch.local_int.lock);

	}

	}