diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 19:14:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 19:14:22 -0800 |
| commit | d93816a63c2b23607ffc318a8addbd54242956c7 (patch) | |
| tree | 6d0049000092f06cf632ea5962b7334b7f1088cf /arch | |
| parent | Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | KVM: PPC: Emulate dcbf (diff) | |
| download | linux-dev-d93816a63c2b23607ffc318a8addbd54242956c7.tar.xz linux-dev-d93816a63c2b23607ffc318a8addbd54242956c7.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kvm/emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index b0855e5d8905..9d9cddc5b346 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c @@ -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 |