From aa55d97916db599cde422ac2ccd4463a994ae00d Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 21 May 2008 13:37:16 +0200
Subject: [PATCH] --- yaml --- r: 97970 b: refs/heads/master c:
 b8cee18cc75d7b9dbe6c6526dfae9ab49e84fa95 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6f569fc80a11..ecf5be426b75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33e3885de25148e00595c4dd808d6eb15db2edcf
+refs/heads/master: b8cee18cc75d7b9dbe6c6526dfae9ab49e84fa95
diff --git a/trunk/arch/s390/kvm/diag.c b/trunk/arch/s390/kvm/diag.c
index f639a152869f..a0775e1f08df 100644
--- a/trunk/arch/s390/kvm/diag.c
+++ b/trunk/arch/s390/kvm/diag.c
@@ -20,7 +20,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);
-	schedule();
+	yield();
 	vcpu_load(vcpu);
 	return 0;
 }