From 68e0847b3c4984cc6a647cc7d8ccdcf97d85a9ea Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 25 Apr 2012 15:30:39 +0200
Subject: [PATCH] --- yaml --- r: 307879 b: refs/heads/master c:
 8733ac36fc37fe055a7d7daadf5451b4231f0214 h: refs/heads/master i:   307877:
 96b90cbc3765be7e3b5e0092bd45c9eece887f82   307875:
 e1c025f6ed6c8c7d461c4e2d6dad93ffdc3cb2b7   307871:
 bda7ee857459e724ab970bd5ae52dd018430d62d v: v3

---
 [refs]                     | 2 +-
 trunk/arch/s390/kvm/diag.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 609bfdfd2892..aafb9d2e4f61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41628d334361670d825fb03c04568f5ef9f084dc
+refs/heads/master: 8733ac36fc37fe055a7d7daadf5451b4231f0214
diff --git a/trunk/arch/s390/kvm/diag.c b/trunk/arch/s390/kvm/diag.c
index 2d2ae327b747..b23d9ac77dfc 100644
--- a/trunk/arch/s390/kvm/diag.c
+++ b/trunk/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;
 }