diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 22:17:10 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 22:17:10 +0100 |
| commit | a9037430c6c784165a940a90bcd29f886834c8e7 (patch) | |
| tree | 4b186e0a761e93a6c6712053d444b566c0d25338 /arch/powerpc/kvm/emulate.c | |
| parent | 6125bc8b86d9da75ddac77e38f41afbf9f5de3e3 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
| download | olio-linux-3.10-a9037430c6c784165a940a90bcd29f886834c8e7.tar.xz olio-linux-3.10-a9037430c6c784165a940a90bcd29f886834c8e7.zip | |
Merge branch 'timers/for-arm' into timers/core
Diffstat (limited to 'arch/powerpc/kvm/emulate.c')
| -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 b0855e5d890..9d9cddc5b34 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 |