Commit ee2fc635 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

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: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c823dd5c

arch/x86/kvm/vmx/vmenter.S

+3 −3
Original line number Diff line number Diff line
@@ -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)

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -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})