From: Alexander Graf <agraf@suse.de>
Date: Sat, 1 Dec 2012 13:50:26 +0000 (+0100)
Subject: KVM: PPC: Make EPCR a valid field for booke64 and bookehv
X-Git-Tag: v3.8-rc1~121^2~5^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62b4db0042aa753810e0d4f184481cc107c925ba;p=profile%2Fivi%2Fkernel-x86-ivi.git

KVM: PPC: Make EPCR a valid field for booke64 and bookehv

In BookE, EPCR is defined and valid when either the HV or the 64bit
category are implemented. Reflect this in the field definition.

Today the only KVM target on 64bit is HV enabled, so there is no
change in actual source code, but this keeps the code closer to the
spec and doesn't build up artificial road blocks for a PR KVM
on 64bit.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 62fbd38..ca9bf45 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/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];