Messages in this thread Patch in this message | | | Date | Wed, 11 Jun 2014 09:23:30 -0400 | From | Steven Rostedt <> | Subject | [PATCH] arm/ftrace: Fix function_return_addr() to function_return_address() |
| |
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 function_return_address(x).
The arm architecture requires this to be redefined but instead of defining function_return_address(x) it defined function_return_addr(x).
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> ---- diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index eb577f4..39eb16b 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level) #endif -#define ftrace_return_addr(n) return_address(n) +#define ftrace_return_address(n) return_address(n) #endif /* ifndef __ASSEMBLY__ */
| |