From: Scott Wood <scottwood@freescale.com>
Date: Wed, 10 Jul 2013 22:47:41 +0000 (-0500)
Subject: kvm/ppc/booke: Don't call kvm_guest_enter twice
X-Git-Tag: firefly_0821_release~176^2~5431^2~5^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c09ec198eb7d5d55fe2f23012a063b7ee107b34a;p=firefly-linux-kernel-4.4.55.git

kvm/ppc/booke: Don't call kvm_guest_enter twice

kvm_guest_enter() was already called by kvmppc_prepare_to_enter().
Don't call it again.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 6e353517c4ad..17722d82f1d1 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -674,8 +674,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
 		goto out;
 	}
 
-	kvm_guest_enter();
-
 #ifdef CONFIG_PPC_FPU
 	/* Save userspace FPU state in stack */
 	enable_kernel_fp();