Commit f8941fbe authored Jun 11, 2013 by Scott Wood Committed by Paolo Bonzini Jun 19, 2013

kvm/ppc/booke: Delay kvmppc_lazy_ee_enable



kwmppc_lazy_ee_enable() should be called as late as possible,
or else we get things like WARN_ON(preemptible()) in enable_kernel_fp()
in configurations where preemptible() works.

Note that book3s_pr already waits until just before __kvmppc_vcpu_run
to call kvmppc_lazy_ee_enable().

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 764bcbc5

arch/powerpc/kvm/booke.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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.