Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b21e023b authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 7689/1: add unwind annotations to ftrace asm 



Add unwind annotations to the ftrace assembly code so that the function
tracer's stacktracing options (func_stack_trace, etc.) work when
CONFIG_ARM_UNWIND is enabled.

Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6f3d90e5

arch/arm/kernel/entry-common.S

+12 −0
Original line number Diff line number Diff line
@@ -276,7 +276,13 @@ ENDPROC(ftrace_graph_caller_old) 
 */



.macro mcount_enter

/*

 * This pad compensates for the push {lr} at the call site.  Note that we are

 * unable to unwind through a function which does not otherwise save its lr.

 */

 UNWIND(.pad	#4)

	stmdb	sp!, {r0-r3, lr}

 UNWIND(.save	{r0-r3, lr})

.endm



.macro mcount_get_lr reg
@@ -289,6 +295,7 @@ ENDPROC(ftrace_graph_caller_old) 
.endm



ENTRY(__gnu_mcount_nc)

UNWIND(.fnstart)

#ifdef CONFIG_DYNAMIC_FTRACE

	mov	ip, lr

	ldmia	sp!, {lr}
@@ -296,17 +303,22 @@ ENTRY(__gnu_mcount_nc) 
#else

	__mcount

#endif

UNWIND(.fnend)

ENDPROC(__gnu_mcount_nc)



#ifdef CONFIG_DYNAMIC_FTRACE

ENTRY(ftrace_caller)

UNWIND(.fnstart)

	__ftrace_caller

UNWIND(.fnend)

ENDPROC(ftrace_caller)

#endif



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

ENTRY(ftrace_graph_caller)

UNWIND(.fnstart)

	__ftrace_graph_caller

UNWIND(.fnend)

ENDPROC(ftrace_graph_caller)

#endif