From 6a5cbd8bde78c65890c826e936067ea29be61660 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 24 Mar 2010 21:48:33 +0100
Subject: [PATCH] --- yaml --- r: 197727 b: refs/heads/master c:
 bd7cdbb7fcd135a399ebb855dc9106747ee2e6ba h: refs/heads/master i:   197725:
 63f14ab146527297503763a9f9bd595878fc54f2   197723:
 49c5b427982b8bcd1eec9413da8e07a88c4274ce   197719:
 a5acdceae35aadfc1f260a3eed4ea98541231870   197711:
 41706aaea201e69ac1576760c7e138f5cc554222   197695:
 f4490653fc46965b341adc0b09cd3ddba5abed88 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/kvm/book3s_64_emulate.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2fb281fd3afa..4a0da1f5a1e5 100644
--- 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
index bbd15906900d..8f50776a9a1d 100644
--- 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));