Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93816a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixlet from Marcelo Tosatti.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: Emulate dcbf
parents 01acd3ef d3286144

arch/powerpc/kvm/emulate.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define OP_31_XOP_TRAP      4

#define OP_31_XOP_LWZX      23

#define OP_31_XOP_TRAP_64   68

#define OP_31_XOP_DCBF      86

#define OP_31_XOP_LBZX      87

#define OP_31_XOP_STWX      151

#define OP_31_XOP_STBX      215
@@ -374,6 +375,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) 
			emulated = kvmppc_emulate_mtspr(vcpu, sprn, rs);

			break;



		case OP_31_XOP_DCBF:

		case OP_31_XOP_DCBI:

			/* Do nothing. The guest is performing dcbi because

			 * hardware DMA is not snooped by the dcache, but