projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.107' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
powerpc
/
kvm
/
emulate.c
diff --git
a/arch/powerpc/kvm/emulate.c
b/arch/powerpc/kvm/emulate.c
index 631a2650e4e42c0038524b0940a9ae91bcdcd3a4..50b482bcbea21dc0db8b879b0b1ec23b96820af6 100644
(file)
--- a/
arch/powerpc/kvm/emulate.c
+++ b/
arch/powerpc/kvm/emulate.c
@@
-511,7
+511,6
@@
int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
advance = 0;
printk(KERN_ERR "Couldn't emulate instruction 0x%08x "
"(op %d xop %d)\n", inst, get_op(inst), get_xop(inst));
- kvmppc_core_queue_program(vcpu, 0);
}
}