Skip to content

Commit

Permalink
arm/ftrace: fix ftrace_return_addr() to ftrace_return_address()
Browse files Browse the repository at this point in the history
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: eed542d (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>
  • Loading branch information
Steven Rostedt authored and Catalin Marinas committed Jun 18, 2014
1 parent b913a64 commit 1712ef4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/include/asm/ftrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */

Expand Down

0 comments on commit 1712ef4

Please sign in to comment.