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

Commit eed542d6 authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Steven Rostedt
Browse files

ftrace: Make CALLER_ADDRx macros more generic 

Most archs with HAVE_ARCH_CALLER_ADDR have pretty much the same
definitions of CALLER_ADDRx(n). Instead of duplicating the code for all
the archs, define a ftrace_return_address0() and
ftrace_return_address(n) that can be overwritten by the archs if they
need to do something different. Instead of 7 macros in every arch, we
now only have at most 2 (and actually only 1 as
ftrace_return_address0() should be the same for all archs).

The CALLER_ADDRx(n) will now be defined in linux/ftrace.h and use the
ftrace_return_address*(n?) macros. This removes a lot of the duplicate
code.

Link: http://lkml.kernel.org/p/1400585464-30333-1-git-send-email-takahiro.akashi@linaro.org



Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent d6d211db

arch/arm/include/asm/ftrace.h

+1 −9
Original line number Diff line number Diff line
@@ -52,15 +52,7 @@ extern inline void *return_address(unsigned int level) 


#endif



#define HAVE_ARCH_CALLER_ADDR



#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#define CALLER_ADDR1 ((unsigned long)return_address(1))

#define CALLER_ADDR2 ((unsigned long)return_address(2))

#define CALLER_ADDR3 ((unsigned long)return_address(3))

#define CALLER_ADDR4 ((unsigned long)return_address(4))

#define CALLER_ADDR5 ((unsigned long)return_address(5))

#define CALLER_ADDR6 ((unsigned long)return_address(6))

#define ftrace_return_addr(n) return_address(n)



#endif /* ifndef __ASSEMBLY__ */

arch/blackfin/include/asm/ftrace.h

+1 −10
Original line number Diff line number Diff line
@@ -66,16 +66,7 @@ extern inline void *return_address(unsigned int level) 


#endif /* CONFIG_FRAME_POINTER */



#define HAVE_ARCH_CALLER_ADDR



/* inline function or macro may lead to unexpected result */

#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#define CALLER_ADDR1 ((unsigned long)return_address(1))

#define CALLER_ADDR2 ((unsigned long)return_address(2))

#define CALLER_ADDR3 ((unsigned long)return_address(3))

#define CALLER_ADDR4 ((unsigned long)return_address(4))

#define CALLER_ADDR5 ((unsigned long)return_address(5))

#define CALLER_ADDR6 ((unsigned long)return_address(6))

#define ftrace_return_address(n) return_address(n)



#endif /* __ASSEMBLY__ */

arch/parisc/include/asm/ftrace.h

+1 −9
Original line number Diff line number Diff line
@@ -24,15 +24,7 @@ extern void return_to_handler(void); 


extern unsigned long return_address(unsigned int);



#define HAVE_ARCH_CALLER_ADDR



#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#define CALLER_ADDR1 return_address(1)

#define CALLER_ADDR2 return_address(2)

#define CALLER_ADDR3 return_address(3)

#define CALLER_ADDR4 return_address(4)

#define CALLER_ADDR5 return_address(5)

#define CALLER_ADDR6 return_address(6)

#define ftrace_return_address(n) return_address(n)



#endif /* __ASSEMBLY__ */

arch/sh/include/asm/ftrace.h

+1 −9
Original line number Diff line number Diff line
@@ -40,15 +40,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) 
/* arch/sh/kernel/return_address.c */

extern void *return_address(unsigned int);



#define HAVE_ARCH_CALLER_ADDR



#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#define CALLER_ADDR1 ((unsigned long)return_address(1))

#define CALLER_ADDR2 ((unsigned long)return_address(2))

#define CALLER_ADDR3 ((unsigned long)return_address(3))

#define CALLER_ADDR4 ((unsigned long)return_address(4))

#define CALLER_ADDR5 ((unsigned long)return_address(5))

#define CALLER_ADDR6 ((unsigned long)return_address(6))

#define ftrace_return_address(n) return_address(n)



#endif /* __ASSEMBLY__ */

arch/xtensa/include/asm/ftrace.h

+4 −10
Original line number Diff line number Diff line
@@ -12,24 +12,18 @@ 


#include <asm/processor.h>



#define HAVE_ARCH_CALLER_ADDR

#ifndef __ASSEMBLY__

#define CALLER_ADDR0 ({ unsigned long a0, a1; \

#define ftrace_return_address0 ({ unsigned long a0, a1; \

		__asm__ __volatile__ ( \

			"mov %0, a0\n" \

			"mov %1, a1\n" \

			: "=r"(a0), "=r"(a1)); \

		MAKE_PC_FROM_RA(a0, a1); })



#ifdef CONFIG_FRAME_POINTER

extern unsigned long return_address(unsigned level);

#define CALLER_ADDR1 return_address(1)

#define CALLER_ADDR2 return_address(2)

#define CALLER_ADDR3 return_address(3)

#else /* CONFIG_FRAME_POINTER */

#define CALLER_ADDR1 (0)

#define CALLER_ADDR2 (0)

#define CALLER_ADDR3 (0)

#endif /* CONFIG_FRAME_POINTER */

#define ftrace_return_address(n) return_address(n)

#endif

#endif /* __ASSEMBLY__ */



#ifdef CONFIG_FUNCTION_TRACER