---

yaml --- r: 197727 b: refs/heads/master c: bd7cdbb h: refs/heads/master i: 197725: 63f14ab 197723: 49c5b42 197719: a5acdce 197711: 41706aa 197695: f449065 v: v3
git-mirror · May 17, 2010 · 6a5cbd8 · 6a5cbd8
1 parent 1628bd2
commit 6a5cbd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fb244a2c215d1e16ee92cb164b7b61c8dfa3909
+refs/heads/master: bd7cdbb7fcd135a399ebb855dc9106747ee2e6ba
diff --git a/trunk/arch/powerpc/kvm/book3s_64_emulate.c b/trunk/arch/powerpc/kvm/book3s_64_emulate.c
@@ -37,6 +37,7 @@
 #define OP_31_XOP_SLBIA		498
 #define OP_31_XOP_MFSR		595
 #define OP_31_XOP_MFSRIN	659
+#define OP_31_XOP_DCBA		758
 #define OP_31_XOP_SLBMFEV	851
 #define OP_31_XOP_EIOIO		854
 #define OP_31_XOP_SLBMFEE	915
@@ -183,6 +184,9 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
 				kvmppc_set_gpr(vcpu, get_rt(inst), t);
 			}
 			break;
+		case OP_31_XOP_DCBA:
+			/* Gets treated as NOP */
+			break;
 		case OP_31_XOP_DCBZ:
 		{
 			ulong rb = kvmppc_get_gpr(vcpu, get_rb(inst));