From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 25 Apr 2012 13:30:39 +0000 (+0200)
Subject: KVM: s390: use kvm_vcpu_on_spin for diag 0x44
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8733ac36fc37fe055a7d7daadf5451b4231f0214;p=openwrt%2Fstaging%2Fblogic.git

KVM: s390: use kvm_vcpu_on_spin for diag 0x44

Lets replace the old open coded version of diag 0x44 (which relied on
compat_sched_yield) with kvm_vcpu_on_spin.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index 2d2ae327b747..b23d9ac77dfc 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -47,9 +47,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)
 {
 	VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");
 	vcpu->stat.diagnose_44++;
-	vcpu_put(vcpu);
-	yield();
-	vcpu_load(vcpu);
+	kvm_vcpu_on_spin(vcpu);
 	return 0;
 }