Skip to content

Commit aaaac06

Browse files
hcahcaVasily Gorbik
authored andcommitted
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>
1 parent b5f3c99 commit aaaac06

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

arch/s390/kernel/mcount.S

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
.section .kprobes.text, "ax"
3030

31-
ENTRY(ftrace_stub)
31+
SYM_FUNC_START(ftrace_stub)
3232
BR_EX %r14
33-
ENDPROC(ftrace_stub)
33+
SYM_FUNC_END(ftrace_stub)
3434

3535
.macro ftrace_regs_entry, allregs=0
3636
stg %r14,(__SF_GPRS+8*8)(%r15) # save traced function caller
@@ -153,8 +153,7 @@ SYM_CODE_END(ftrace_shared_hotpatch_trampoline_exrl)
153153

154154
#ifdef CONFIG_RETHOOK
155155

156-
SYM_FUNC_START(arch_rethook_trampoline)
157-
156+
SYM_CODE_START(arch_rethook_trampoline)
158157
stg %r14,(__SF_GPRS+8*8)(%r15)
159158
lay %r15,-STACK_FRAME_SIZE(%r15)
160159
stmg %r0,%r14,STACK_PTREGS_GPRS(%r15)
@@ -177,7 +176,6 @@ SYM_FUNC_START(arch_rethook_trampoline)
177176
mvc __SF_EMPTY(16,%r7),STACK_PTREGS_PSW(%r15)
178177
lmg %r0,%r15,STACK_PTREGS_GPRS(%r15)
179178
lpswe __SF_EMPTY(%r15)
180-
181-
SYM_FUNC_END(arch_rethook_trampoline)
179+
SYM_CODE_END(arch_rethook_trampoline)
182180

183181
#endif /* CONFIG_RETHOOK */

0 commit comments

Comments
 (0)