Commit 1157eb8f authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent c91db232

arch/arm64/kernel/vdso32/sigreturn.S

+8 −15
Original line number Diff line number Diff line
@@ -10,13 +10,6 @@ 
#include <asm/asm-offsets.h>

#include <asm/unistd.h>



#define ARM_ENTRY(name)		\

	ENTRY(name)



#define ARM_ENDPROC(name)	\

	.type name, %function;	\

	END(name)



	.text



	.arm
@@ -24,39 +17,39 @@ 
	.save {r0-r15}

	.pad #COMPAT_SIGFRAME_REGS_OFFSET

	nop

ARM_ENTRY(__kernel_sigreturn_arm)

SYM_FUNC_START(__kernel_sigreturn_arm)

	mov r7, #__NR_compat_sigreturn

	svc #0

	.fnend

ARM_ENDPROC(__kernel_sigreturn_arm)

SYM_FUNC_END(__kernel_sigreturn_arm)



	.fnstart

	.save {r0-r15}

	.pad #COMPAT_RT_SIGFRAME_REGS_OFFSET

	nop

ARM_ENTRY(__kernel_rt_sigreturn_arm)

SYM_FUNC_START(__kernel_rt_sigreturn_arm)

	mov r7, #__NR_compat_rt_sigreturn

	svc #0

	.fnend

ARM_ENDPROC(__kernel_rt_sigreturn_arm)

SYM_FUNC_END(__kernel_rt_sigreturn_arm)



	.thumb

	.fnstart

	.save {r0-r15}

	.pad #COMPAT_SIGFRAME_REGS_OFFSET

	nop

ARM_ENTRY(__kernel_sigreturn_thumb)

SYM_FUNC_START(__kernel_sigreturn_thumb)

	mov r7, #__NR_compat_sigreturn

	svc #0

	.fnend

ARM_ENDPROC(__kernel_sigreturn_thumb)

SYM_FUNC_END(__kernel_sigreturn_thumb)



	.fnstart

	.save {r0-r15}

	.pad #COMPAT_RT_SIGFRAME_REGS_OFFSET

	nop

ARM_ENTRY(__kernel_rt_sigreturn_thumb)

SYM_FUNC_START(__kernel_rt_sigreturn_thumb)

	mov r7, #__NR_compat_rt_sigreturn

	svc #0

	.fnend

ARM_ENDPROC(__kernel_rt_sigreturn_thumb)
 
SYM_FUNC_END(__kernel_rt_sigreturn_thumb)

CRA Git | Maintained and supported by SUSTech CRA and CCSE