git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
s390
/
kvm
/
diag.c
diff --git
a/arch/s390/kvm/diag.c
b/arch/s390/kvm/diag.c
index
f639a15
..
a0775e1
100644
(file)
--- a/
arch/s390/kvm/diag.c
+++ b/
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;
}