s390/vdso: Use macros for annotation of asm functions

Use the macros SYM_FUNC_START() and SYM_FUNC_END() to annotate the
functions in assembly.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Acked-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/vdso64/vdso_user_wrapper.S b/arch/s390/kernel/vdso64/vdso_user_wrapper.S
index e26e68675c08d690c23237f482a1046ab77b987e..aa06c85bcbd357d79cf79eec2917181a7d7106b8 100644 (file)
--- a/arch/s390/kernel/vdso64/vdso_user_wrapper.S
+++ b/arch/s390/kernel/vdso64/vdso_user_wrapper.S
@@ -13,10 +13,7 @@
  * for details.
  */
 .macro vdso_func func
-       .globl __kernel_\func
-       .type  __kernel_\func,@function
-       __ALIGN
-__kernel_\func:
+SYM_FUNC_START(__kernel_\func)
        CFI_STARTPROC
        aghi    %r15,-STACK_FRAME_VDSO_OVERHEAD
        CFI_DEF_CFA_OFFSET (STACK_FRAME_USER_OVERHEAD + STACK_FRAME_VDSO_OVERHEAD)
@@ -32,7 +29,7 @@ __kernel_\func:
        CFI_RESTORE 15
        br      %r14
        CFI_ENDPROC
-       .size   __kernel_\func,.-__kernel_\func
+SYM_FUNC_END(__kernel_\func)
 .endm
 
 vdso_func gettimeofday
@@ -41,16 +38,13 @@ vdso_func clock_gettime
 vdso_func getcpu
 
 .macro vdso_syscall func,syscall
-       .globl __kernel_\func
-       .type  __kernel_\func,@function
-       __ALIGN
-__kernel_\func:
+SYM_FUNC_START(__kernel_\func)
        CFI_STARTPROC
        svc     \syscall
        /* Make sure we notice when a syscall returns, which shouldn't happen */
        .word   0
        CFI_ENDPROC
-       .size   __kernel_\func,.-__kernel_\func
+SYM_FUNC_END(__kernel_\func)
 .endm
 
 vdso_syscall restart_syscall,__NR_restart_syscall