aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Christopherson <sean.j.christopherson@intel.com>2019-01-25 07:41:14 -0800
committerPaolo Bonzini <pbonzini@redhat.com>2019-02-20 22:48:15 +0100
commitee2fc635ef714b1d46da3616bbec972067f0d187 (patch)
treea1165682e4ed421d770ca793c988f16335088fd4
parentc823dd5c0f3fafa595ed51cc72c6e006efc20ad3 (diff)
downloadlinux-stericsson-ee2fc635ef714b1d46da3616bbec972067f0d187.tar.gz
KVM: VMX: Rename ____vmx_vcpu_run() to __vmx_vcpu_run()
...now that the name is no longer usurped by a defunct helper function. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/vmx/vmenter.S6
-rw-r--r--arch/x86/kvm/vmx/vmx.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index e64617f3b196..fa6e03b36348 100644
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -81,7 +81,7 @@ ENTRY(vmx_vmexit)
ENDPROC(vmx_vmexit)
/**
- * ____vmx_vcpu_run - Run a vCPU via a transition to VMX guest mode
+ * __vmx_vcpu_run - Run a vCPU via a transition to VMX guest mode
* @vmx: struct vcpu_vmx *
* @regs: unsigned long * (to guest registers)
* %RBX: VMCS launched status (non-zero indicates already launched)
@@ -89,7 +89,7 @@ ENDPROC(vmx_vmexit)
* Returns:
* %RBX is 0 on VM-Exit, 1 on VM-Fail
*/
-ENTRY(____vmx_vcpu_run)
+ENTRY(__vmx_vcpu_run)
push %_ASM_BP
mov %_ASM_SP, %_ASM_BP
@@ -198,4 +198,4 @@ ENTRY(____vmx_vcpu_run)
/* VM-Fail. Out-of-line to avoid a taken Jcc after VM-Exit. */
2: mov $1, %ebx
jmp 1b
-ENDPROC(____vmx_vcpu_run)
+ENDPROC(__vmx_vcpu_run)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index e61bb8da9767..8bc8f09eaf0c 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6445,7 +6445,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
write_cr2(vcpu->arch.cr2);
asm(
- "call ____vmx_vcpu_run \n\t"
+ "call __vmx_vcpu_run \n\t"
: ASM_CALL_CONSTRAINT, "=b"(vmx->fail),
#ifdef CONFIG_X86_64
"=D"((int){0}), "=S"((int){0})