Commit 2852aab8 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

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.
parents 4bd13772 6df3877f

arch/powerpc/kvm/powerpc.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

}