From 4a06977c1efc799bfa1f40ef694897fdfee4821a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Sat, 1 Dec 2012 14:50:26 +0100
Subject: [PATCH] --- yaml --- r: 343587 b: refs/heads/master c:
 62b4db0042aa753810e0d4f184481cc107c925ba h: refs/heads/master i:   343585:
 ce366c77067f343de77f47d3003539578c4b55d5   343583:
 882a261317be0f50e3bcfa9f4d02523352030955 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/include/asm/kvm_host.h | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5ed40dd32957..02e6e8d4c202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9666ea1b3d11509b76f8ff5b9776d8d30709b19
+refs/heads/master: 62b4db0042aa753810e0d4f184481cc107c925ba
diff --git a/trunk/arch/powerpc/include/asm/kvm_host.h b/trunk/arch/powerpc/include/asm/kvm_host.h
index 62fbd38b15fa..ca9bf459db6a 100644
--- a/trunk/arch/powerpc/include/asm/kvm_host.h
+++ b/trunk/arch/powerpc/include/asm/kvm_host.h
@@ -406,13 +406,18 @@ struct kvm_vcpu_arch {
 	u32 host_mas4;
 	u32 host_mas6;
 	u32 shadow_epcr;
-	u32 epcr;
 	u32 shadow_msrp;
 	u32 eplc;
 	u32 epsc;
 	u32 oldpir;
 #endif
 
+#if defined(CONFIG_BOOKE)
+#if defined(CONFIG_KVM_BOOKE_HV) || defined(CONFIG_64BIT)
+	u32 epcr;
+#endif
+#endif
+
 #ifdef CONFIG_PPC_BOOK3S
 	/* For Gekko paired singles */
 	u32 qpr[32];