From eefd205acb0526fb7c9f30cbf4d1ea9ffab87e63 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Tue, 11 Jun 2013 11:38:31 -0500
Subject: [PATCH] --- yaml --- r: 377268 b: refs/heads/master c:
 f8941fbe204fa2fb51e7acd8bfd0f51225fe03b4 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/powerpc/kvm/booke.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b1e2adf700ea..b7fcfff446a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 764bcbc5a6d7a2f3e75c9f0e4caa984e2926e346
+refs/heads/master: f8941fbe204fa2fb51e7acd8bfd0f51225fe03b4
diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c
index 5cd7ad0c1176..1a1b51189773 100644
--- a/trunk/arch/powerpc/kvm/booke.c
+++ b/trunk/arch/powerpc/kvm/booke.c
@@ -673,7 +673,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
 		ret = s;
 		goto out;
 	}
-	kvmppc_lazy_ee_enable();
 
 	kvm_guest_enter();
 
@@ -699,6 +698,8 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
 	kvmppc_load_guest_fp(vcpu);
 #endif
 
+	kvmppc_lazy_ee_enable();
+
 	ret = __kvmppc_vcpu_run(kvm_run, vcpu);
 
 	/* No need for kvm_guest_exit. It's done in handle_exit.