s390/mcount: use SYM* macros instead of ENTRY(), etc.

Consistently use the SYM* family of macros instead of the
deprecated ENTRY(), ENDPROC(), etc. family of macros.

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

diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S
index 4c4ee762f51565a6013bdd6cc5f56f602bbcc085..a7902fdb7ba292c791bc325e43cd06f98b71a03e 100644 (file)
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
@@ -28,9 +28,9 @@
 
        .section .kprobes.text, "ax"
 
-ENTRY(ftrace_stub)
+SYM_FUNC_START(ftrace_stub)
        BR_EX   %r14
-ENDPROC(ftrace_stub)
+SYM_FUNC_END(ftrace_stub)
 
        .macro  ftrace_regs_entry, allregs=0
        stg     %r14,(__SF_GPRS+8*8)(%r15)      # save traced function caller
@@ -153,8 +153,7 @@ SYM_CODE_END(ftrace_shared_hotpatch_trampoline_exrl)
 
 #ifdef CONFIG_RETHOOK
 
-SYM_FUNC_START(arch_rethook_trampoline)
-
+SYM_CODE_START(arch_rethook_trampoline)
        stg     %r14,(__SF_GPRS+8*8)(%r15)
        lay     %r15,-STACK_FRAME_SIZE(%r15)
        stmg    %r0,%r14,STACK_PTREGS_GPRS(%r15)
@@ -177,7 +176,6 @@ SYM_FUNC_START(arch_rethook_trampoline)
        mvc     __SF_EMPTY(16,%r7),STACK_PTREGS_PSW(%r15)
        lmg     %r0,%r15,STACK_PTREGS_GPRS(%r15)
        lpswe   __SF_EMPTY(%r15)
-
-SYM_FUNC_END(arch_rethook_trampoline)
+SYM_CODE_END(arch_rethook_trampoline)
 
 #endif /* CONFIG_RETHOOK */