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;
 }