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 tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kvm
/
vz.c
diff --git
a/arch/mips/kvm/vz.c
b/arch/mips/kvm/vz.c
index c299e5d6d69c9ee36bde361888e6cba745fcb1ef..2ffbe9264a316e48224bd02793bb5608caebd4f5 100644
(file)
--- a/
arch/mips/kvm/vz.c
+++ b/
arch/mips/kvm/vz.c
@@
-3266,7
+3266,7
@@
static int kvm_vz_vcpu_run(struct kvm_vcpu *vcpu)
kvm_vz_vcpu_load_tlb(vcpu, cpu);
kvm_vz_vcpu_load_wired(vcpu);
- r = vcpu->arch.vcpu_run(vcpu
->run, vcpu
);
+ r = vcpu->arch.vcpu_run(vcpu);
kvm_vz_vcpu_save_wired(vcpu);