1 files changed, 9 insertions, 9 deletions

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index fa29585c63ff..d1a4f42f6c97 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -10272,15 +10272,6 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
                 nested_ept_init_mmu_context(vcpu);
         }
 
-        if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)
-                vcpu->arch.efer = vmcs12->guest_ia32_efer;
-        else if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)
-                vcpu->arch.efer |= (EFER_LMA | EFER_LME);
-        else
-                vcpu->arch.efer &= ~(EFER_LMA | EFER_LME);
-        /* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */
-        vmx_set_efer(vcpu, vcpu->arch.efer);
-
         /*
          * This sets GUEST_CR0 to vmcs12->guest_cr0, with possibly a modified
          * TS bit (for lazy fpu) and bits which we consider mandatory enabled.
@@ -10295,6 +10286,15 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
         vmx_set_cr4(vcpu, vmcs12->guest_cr4);
         vmcs_writel(CR4_READ_SHADOW, nested_read_cr4(vmcs12));
 
+        if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)
+                vcpu->arch.efer = vmcs12->guest_ia32_efer;
+        else if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)
+                vcpu->arch.efer |= (EFER_LMA | EFER_LME);
+        else
+                vcpu->arch.efer &= ~(EFER_LMA | EFER_LME);
+        /* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */
+        vmx_set_efer(vcpu, vcpu->arch.efer);
+
         /* shadow page tables on either EPT or shadow page tables */
         kvm_set_cr3(vcpu, vmcs12->guest_cr3);
         kvm_mmu_reset_context(vcpu);