From: Anup Patel <anup.patel@linaro.org>
Date: Thu, 12 Dec 2013 16:12:23 +0000 (+0000)
Subject: arm64: KVM: Force undefined exception for Guest SMC intructions
X-Git-Tag: v3.14-rc1~127^2~25^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e5cf9dcdbfd26cd4e1991db08755da900454efeb;p=~emulex%2Finfiniband.git

arm64: KVM: Force undefined exception for Guest SMC intructions

The SMC-based PSCI emulation for Guest is going to be very different
from the in-kernel HVC-based PSCI emulation hence for now just inject
undefined exception when Guest executes SMC instruction.

Signed-off-by: Anup Patel <anup.patel@linaro.org>
Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
Signed-off-by: marc Zyngier <marc.zyngier@arm.com>
---

diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 8da56067c30..df84d7bcc7d 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -39,9 +39,6 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)
 
 static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
-	if (kvm_psci_call(vcpu))
-		return 1;
-
 	kvm_inject_undefined(vcpu);
 	return 1;
 }