From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Sat, 3 Jan 2009 22:23:09 +0000 (-0600)
Subject: KVM: ppc: ifdef iccci with CONFIG_44x
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=17c885eb5c38f39a2bb3143a67687bd905dcd0fa;p=linux-2.6-omap-h63xx.git

KVM: ppc: ifdef iccci with CONFIG_44x

E500 deosn't support this instruction.

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 084ebcd7dd8..4679ec287e6 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -347,7 +347,9 @@ lightweight_exit:
 	lwz	r3, VCPU_SHADOW_PID(r4)
 	mtspr	SPRN_PID, r3
 
+#ifdef CONFIG_44x
 	iccci	0, 0 /* XXX hack */
+#endif
 
 	/* Load some guest volatiles. */
 	lwz	r0, VCPU_GPR(r0)(r4)