KVM: VMX: Remove unneeded __ASM_SIZE usage with POP instruction

POP [mem] defaults to the word size, and the only legal non-default
size is 16 bits, e.g. a 32-bit POP will #UD in 64-bit mode and vice
versa, no need to use __ASM_SIZE macro to force operating mode.

Changes since v1:
- Fix commit message.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Message-Id: <20200427205035.1594232-1-ubizjak@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index 51d1a82742fd5ba11b0b18f545b37edf5d3e6767..e0a182cb3cdddd662af694ce06544d5c01b0ae32 100644 (file)
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -166,13 +166,13 @@ SYM_FUNC_START(__vmx_vcpu_run)
        mov WORD_SIZE(%_ASM_SP), %_ASM_AX
 
        /* Save all guest registers, including RAX from the stack */
-       __ASM_SIZE(pop) VCPU_RAX(%_ASM_AX)
-       mov %_ASM_CX,   VCPU_RCX(%_ASM_AX)
-       mov %_ASM_DX,   VCPU_RDX(%_ASM_AX)
-       mov %_ASM_BX,   VCPU_RBX(%_ASM_AX)
-       mov %_ASM_BP,   VCPU_RBP(%_ASM_AX)
-       mov %_ASM_SI,   VCPU_RSI(%_ASM_AX)
-       mov %_ASM_DI,   VCPU_RDI(%_ASM_AX)
+       pop           VCPU_RAX(%_ASM_AX)
+       mov %_ASM_CX, VCPU_RCX(%_ASM_AX)
+       mov %_ASM_DX, VCPU_RDX(%_ASM_AX)
+       mov %_ASM_BX, VCPU_RBX(%_ASM_AX)
+       mov %_ASM_BP, VCPU_RBP(%_ASM_AX)
+       mov %_ASM_SI, VCPU_RSI(%_ASM_AX)
+       mov %_ASM_DI, VCPU_RDI(%_ASM_AX)
 #ifdef CONFIG_X86_64
        mov %r8,  VCPU_R8 (%_ASM_AX)
        mov %r9,  VCPU_R9 (%_ASM_AX)