[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140611092330.7930eff2@gandalf.local.home>
Date: Wed, 11 Jun 2014 09:23:30 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Will Deacon <will.deacon@....com>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>,
AKASHI Takahiro <takahiro.akashi@...aro.org>,
Frédéric Weisbecker <fweisbec@...il.com>,
Ingo Molnar <mingo@...hat.com>,
Catalin Marinas <catalin.marinas@....com>,
tim.bird@...ymobile.com, gkulkarni@...iumnetworks.com,
dsaxena@...aro.org, arndb@...db.de,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
linaro-kernel <linaro-kernel@...ts.linaro.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Linux-sh list <linux-sh@...r.kernel.org>
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@...ux-m68k.org>
Signed-off-by: Steven Rostedt <rostedt@...dmis.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__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists