leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: VMX: Rename ____vmx_vcpu_run() to __vmx_vcpu_run()

Browse Source 
...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>
This commit is contained in:
Sean Christopherson 2019-01-25 07:41:14 -08:00 committed by Paolo Bonzini
parent c823dd5c0f
commit ee2fc635ef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kvm/vmx/vmenter.S
View File

@ -81,7 +81,7 @@ ENTRY(vmx_vmexit)
ENDPROC(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 * * @vmx: struct vcpu_vmx *
* @regs: unsigned long * (to guest registers) * @regs: unsigned long * (to guest registers)
* %RBX: VMCS launched status (non-zero indicates already launched) * %RBX: VMCS launched status (non-zero indicates already launched)
@ -89,7 +89,7 @@ ENDPROC(vmx_vmexit)
* Returns: * Returns:
* %RBX is 0 on VM-Exit, 1 on VM-Fail * %RBX is 0 on VM-Exit, 1 on VM-Fail
*/ */
ENTRY(____vmx_vcpu_run) ENTRY(__vmx_vcpu_run)
push %_ASM_BP push %_ASM_BP
mov %_ASM_SP, %_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. */ /* VM-Fail. Out-of-line to avoid a taken Jcc after VM-Exit. */
2: mov $1, %ebx 2: mov $1, %ebx
jmp 1b jmp 1b
ENDPROC(____vmx_vcpu_run) ENDPROC(__vmx_vcpu_run)

2
arch/x86/kvm/vmx/vmx.c
View File

@ -6445,7 +6445,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
write_cr2(vcpu->arch.cr2); write_cr2(vcpu->arch.cr2);
asm( asm(
"call ____vmx_vcpu_run \n\t" "call __vmx_vcpu_run \n\t"
: ASM_CALL_CONSTRAINT, "=b"(vmx->fail), : ASM_CALL_CONSTRAINT, "=b"(vmx->fail),
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
"=D"((int){0}), "=S"((int){0}) "=D"((int){0}), "=S"((int){0})