aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2014-06-16 15:25:29 +0100
committerMark Brown <broonie@linaro.org>2014-06-24 12:40:51 +0100
commit99f555fa816f7436a36ebb0d5327dbfab27c6824 (patch)
tree51fa8aab0f829320db86f9461f4b97acc1a0b42f
parent0cc5286fc3ca12ec0d388e4d8c08a66b40d52233 (diff)
downloadlinux-linaro-stable-v3.10/topic/arm64-ftrace.tar.gz
arm/ftrace: fix ftrace_return_addr() to ftrace_return_address()v3.10/topic/arm64-ftrace
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> (cherry picked from commit 1712ef43af71b0a0498ad370f0829d6b85fa2dca) Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--arch/arm/include/asm/ftrace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index eb577f4f5f70..39eb16b0066f 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__ */