Skip to content

Commit 1157eb8

Browse files
brooniectmarinas
authored andcommitted
arm64: vdso32: Convert to modern assembler annotations
In an effort to clarify and simplify the annotation of assembly functions new macros have been introduced. These replace ENTRY and ENDPROC with two different annotations for normal functions and those with unusual calling conventions. Use these for the compat VDSO, allowing us to drop the custom ARM_ENTRY() and ARM_ENDPROC() macros. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent c91db23 commit 1157eb8

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

arch/arm64/kernel/vdso32/sigreturn.S

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,46 @@
1010
#include <asm/asm-offsets.h>
1111
#include <asm/unistd.h>
1212

13-
#define ARM_ENTRY(name) \
14-
ENTRY(name)
15-
16-
#define ARM_ENDPROC(name) \
17-
.type name, %function; \
18-
END(name)
19-
2013
.text
2114

2215
.arm
2316
.fnstart
2417
.save {r0-r15}
2518
.pad #COMPAT_SIGFRAME_REGS_OFFSET
2619
nop
27-
ARM_ENTRY(__kernel_sigreturn_arm)
20+
SYM_FUNC_START(__kernel_sigreturn_arm)
2821
mov r7, #__NR_compat_sigreturn
2922
svc #0
3023
.fnend
31-
ARM_ENDPROC(__kernel_sigreturn_arm)
24+
SYM_FUNC_END(__kernel_sigreturn_arm)
3225

3326
.fnstart
3427
.save {r0-r15}
3528
.pad #COMPAT_RT_SIGFRAME_REGS_OFFSET
3629
nop
37-
ARM_ENTRY(__kernel_rt_sigreturn_arm)
30+
SYM_FUNC_START(__kernel_rt_sigreturn_arm)
3831
mov r7, #__NR_compat_rt_sigreturn
3932
svc #0
4033
.fnend
41-
ARM_ENDPROC(__kernel_rt_sigreturn_arm)
34+
SYM_FUNC_END(__kernel_rt_sigreturn_arm)
4235

4336
.thumb
4437
.fnstart
4538
.save {r0-r15}
4639
.pad #COMPAT_SIGFRAME_REGS_OFFSET
4740
nop
48-
ARM_ENTRY(__kernel_sigreturn_thumb)
41+
SYM_FUNC_START(__kernel_sigreturn_thumb)
4942
mov r7, #__NR_compat_sigreturn
5043
svc #0
5144
.fnend
52-
ARM_ENDPROC(__kernel_sigreturn_thumb)
45+
SYM_FUNC_END(__kernel_sigreturn_thumb)
5346

5447
.fnstart
5548
.save {r0-r15}
5649
.pad #COMPAT_RT_SIGFRAME_REGS_OFFSET
5750
nop
58-
ARM_ENTRY(__kernel_rt_sigreturn_thumb)
51+
SYM_FUNC_START(__kernel_rt_sigreturn_thumb)
5952
mov r7, #__NR_compat_rt_sigreturn
6053
svc #0
6154
.fnend
62-
ARM_ENDPROC(__kernel_rt_sigreturn_thumb)
55+
SYM_FUNC_END(__kernel_rt_sigreturn_thumb)

0 commit comments

Comments
 (0)