diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-13 15:08:41 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-13 15:08:41 +1100 |
| commit | 2852aab819574fbcd9fa2cba8a263479506c5f70 (patch) | |
| tree | 7c60bb4b5ae744891daa4dfc487fff658c23870c /arch/powerpc | |
| parent | 4bd13772eeb2b9989789e8dbc183026867168db4 (diff) | |
| parent | 6df3877fc962c2bb3d0438633dfd24a185af6838 (diff) | |
Merge two commits from 'kvm-ppc-fixes' into next
This merges two commits from the `kvm-ppc-fixes` branch into next, as
they fix build breaks we are seeing while testing next.
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 403e642c78f5..52c205373986 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -1345,7 +1345,7 @@ static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu, int kvmppc_handle_load128_by2x64(struct kvm_run *run, struct kvm_vcpu *vcpu, unsigned int rt, int is_default_endian) { - enum emulation_result emulated; + enum emulation_result emulated = EMULATE_DONE; while (vcpu->arch.mmio_vmx_copy_nums) { emulated = __kvmppc_handle_load(run, vcpu, rt, 8, @@ -1608,7 +1608,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) kvm_sigset_deactivate(vcpu); +#ifdef CONFIG_ALTIVEC out: +#endif vcpu_put(vcpu); return r; } |