git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/i8259
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kvm
/
x86_emulate.c
diff --git
a/arch/x86/kvm/x86_emulate.c
b/arch/x86/kvm/x86_emulate.c
index 8a96320ab071b06f1d3102518b55877d297517b8..932f216d890c343bc5ca4ebfd8a15e1955334969 100644
(file)
--- a/
arch/x86/kvm/x86_emulate.c
+++ b/
arch/x86/kvm/x86_emulate.c
@@
-1727,7
+1727,8
@@
twobyte_insn:
if (rc)
goto done;
- kvm_emulate_hypercall(ctxt->vcpu);
+ /* Let the processor re-execute the fixed hypercall */
+ c->eip = ctxt->vcpu->arch.rip;
/* Disable writeback. */
c->dst.type = OP_NONE;
break;