summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2013-07-11 00:47:41 +0200
committerAlexander Graf <agraf@suse.de>2013-07-11 00:58:49 +0200
commitc09ec198eb7d5d55fe2f23012a063b7ee107b34a (patch)
tree006b251cc8f4f443778a8eb18dcff38f18e4ee80 /arch/powerpc/kvm
parentkvm/ppc: Call trace_hardirqs_on before entry (diff)
downloadlinux-c09ec198eb7d5d55fe2f23012a063b7ee107b34a.tar.xz
linux-c09ec198eb7d5d55fe2f23012a063b7ee107b34a.zip
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>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r--arch/powerpc/kvm/booke.c2
1 files changed, 0 insertions, 2 deletions
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();