---

yaml --- r: 307879 b: refs/heads/master c: 8733ac3 h: refs/heads/master i: 307877: 96b90cb 307875: e1c025f 307871: bda7ee8 v: v3
git-mirror · May 1, 2012 · 68e0847 · 68e0847
1 parent 992b80d
commit 68e0847
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 }