kvm/ppc: Call trace_hardirqs_on before entry

[karo-tx-linux.git] / arch / powerpc / kvm / book3s_pr.c

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 19498a567a81f25c67c7f1b3f010182fcb680e2b..ddfaf560e5037e928cd521c8403cfc9d74bd5ff6 100644 (file)
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -890,7 +890,7 @@ program_interrupt:
                        local_irq_enable();
                        r = s;
                } else {
-                       kvmppc_lazy_ee_enable();
+                       kvmppc_fix_ee_before_entry();
                }
        }
 
@@ -1161,7 +1161,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
        if (vcpu->arch.shared->msr & MSR_FP)
                kvmppc_handle_ext(vcpu, BOOK3S_INTERRUPT_FP_UNAVAIL, MSR_FP);
 
-       kvmppc_lazy_ee_enable();
+       kvmppc_fix_ee_before_entry();
 
        ret = __kvmppc_vcpu_run(kvm_run, vcpu);