mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +00:00
1712ef43af
The clean up of CALLER_ADDR*() functions required the archs to either
use the default __builtin_return_address(X) (where X > 0) or override
it with something the arch can use. To override it, the arch would
define ftrace_return_address(x).
The arm architecture requires this to be redefined but instead of
defining ftrace_return_address(x) it defined ftrace_return_addr(x).
Fixes: eed542d696 (ftrace: Make CALLER_ADDRx macros more generic)
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
59 lines
1.2 KiB
C
59 lines
1.2 KiB
C
#ifndef _ASM_ARM_FTRACE
|
|
#define _ASM_ARM_FTRACE
|
|
|
|
#ifdef CONFIG_FUNCTION_TRACER
|
|
#define MCOUNT_ADDR ((unsigned long)(__gnu_mcount_nc))
|
|
#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
|
|
|
|
#ifndef __ASSEMBLY__
|
|
extern void mcount(void);
|
|
extern void __gnu_mcount_nc(void);
|
|
|
|
#ifdef CONFIG_DYNAMIC_FTRACE
|
|
struct dyn_arch_ftrace {
|
|
#ifdef CONFIG_OLD_MCOUNT
|
|
bool old_mcount;
|
|
#endif
|
|
};
|
|
|
|
static inline unsigned long ftrace_call_adjust(unsigned long addr)
|
|
{
|
|
/* With Thumb-2, the recorded addresses have the lsb set */
|
|
return addr & ~1;
|
|
}
|
|
|
|
extern void ftrace_caller_old(void);
|
|
extern void ftrace_call_old(void);
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND)
|
|
/*
|
|
* return_address uses walk_stackframe to do it's work. If both
|
|
* CONFIG_FRAME_POINTER=y and CONFIG_ARM_UNWIND=y walk_stackframe uses unwind
|
|
* information. For this to work in the function tracer many functions would
|
|
* have to be marked with __notrace. So for now just depend on
|
|
* !CONFIG_ARM_UNWIND.
|
|
*/
|
|
|
|
void *return_address(unsigned int);
|
|
|
|
#else
|
|
|
|
extern inline void *return_address(unsigned int level)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
#endif
|
|
|
|
#define ftrace_return_address(n) return_address(n)
|
|
|
|
#endif /* ifndef __ASSEMBLY__ */
|
|
|
|
#endif /* _ASM_ARM_FTRACE */
|