From 548e43fb76fd482ef7b847a9ebee089d29b2e2dc Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 8 Aug 2011 17:22:59 +0200
Subject: [PATCH] --- yaml --- r: 271503 b: refs/heads/master c:
 aacf9aa3a7762a878c40fddef6e68262b9f9f383 h: refs/heads/master i:   271501:
 3080ef85717df127e80a98f939e5d75289992292   271499:
 ebf4b7d9e6371439496a0abc1046329c58d9346b   271495:
 e04c24f8e7d6963ed151410dea3b82d012bdbf8c   271487:
 ffecfe70e10bd6eef08fbbc6209dc95a06f7f04d v: v3

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

diff --git a/[refs] b/[refs]
index 693c2cce03b1..326e3c68fde1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0254f0742998dc61fcf68a3488e2d93636031263
+refs/heads/master: aacf9aa3a7762a878c40fddef6e68262b9f9f383
diff --git a/trunk/arch/powerpc/kvm/book3s_emulate.c b/trunk/arch/powerpc/kvm/book3s_emulate.c
index bf0ddcd98bcc..0c9dc62532d0 100644
--- a/trunk/arch/powerpc/kvm/book3s_emulate.c
+++ b/trunk/arch/powerpc/kvm/book3s_emulate.c
@@ -473,6 +473,10 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
 	case SPRN_HID5:
 		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->hid[5]);
 		break;
+	case SPRN_CFAR:
+	case SPRN_PURR:
+		kvmppc_set_gpr(vcpu, rt, 0);
+		break;
 	case SPRN_GQR0:
 	case SPRN_GQR1:
 	case SPRN_GQR2: