]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
arm/ftrace: fix ftrace_return_addr() to ftrace_return_address()
authorSteven Rostedt <rostedt@goodmis.org>
Mon, 16 Jun 2014 14:25:29 +0000 (15:25 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 18 Jun 2014 11:40:55 +0000 (12:40 +0100)
commit1712ef43af71b0a0498ad370f0829d6b85fa2dca
treed9f9f55680f42e13fa5cd8db434ef48a15e1b07f
parentb913a6404ce2b7d10a735834218d3c1e1bceff2a
arm/ftrace: fix ftrace_return_addr() to ftrace_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 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: eed542d6962b (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>
arch/arm/include/asm/ftrace.h