Use the CFI macros instead of the raw .cfi_* directives to be consistent
with the rest of the VDSO asm.  It's also easier on the eyes.

No functional changes.

Signed-off-by: Josh Poimboeuf <jpoim...@kernel.org>
---
 arch/x86/entry/vdso/vsgx.S | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/x86/entry/vdso/vsgx.S b/arch/x86/entry/vdso/vsgx.S
index c0342238c976..8d7b8eb45c50 100644
--- a/arch/x86/entry/vdso/vsgx.S
+++ b/arch/x86/entry/vdso/vsgx.S
@@ -24,13 +24,14 @@
 .section .text, "ax"
 
 SYM_FUNC_START(__vdso_sgx_enter_enclave)
+       SYM_F_ALIGN
        push    %rbp
-       .cfi_adjust_cfa_offset  8
-       .cfi_rel_offset         %rbp, 0
+       CFI_ADJUST_CFA_OFFSET   8
+       CFI_REL_OFFSET          %rbp, 0
        mov     %rsp, %rbp
-       .cfi_def_cfa_register   %rbp
+       CFI_DEF_CFA_REGISTER    %rbp
        push    %rbx
-       .cfi_rel_offset         %rbx, -8
+       CFI_REL_OFFSET          %rbx, -8
 
        mov     %ecx, %eax
 .Lenter_enclave:
@@ -77,13 +78,11 @@ SYM_FUNC_START(__vdso_sgx_enter_enclave)
 .Lout:
        pop     %rbx
        leave
-       .cfi_def_cfa            %rsp, 8
+       CFI_DEF_CFA             %rsp, 8
        RET
 
-       /* The out-of-line code runs with the pre-leave stack frame. */
-       .cfi_def_cfa            %rbp, 16
-
 .Linvalid_input:
+       CFI_DEF_CFA             %rbp, 16
        mov     $(-EINVAL), %eax
        jmp     .Lout
 
-- 
2.48.1


Reply via email to