[PATCH v2] arm: LLVMLinux: use static inline in ARM ftrace.h

behanw at converseincode.com behanw at converseincode.com
Mon Mar 24 01:58:29 EDT 2014

From: Behan Webster <behanw at converseincode.com>

With compilers which follow the C99 standard (like modern versions of gcc and
clang), "extern inline" does the wrong thing (emits code for an externally
linkable version of the inline function). In this case using static inline
and removing the NULL version of return_address in return_address.c does
the right thing.

Signed-off-by: Behan Webster <behanw at converseincode.com>
Reviewed-by: Mark Charlebois <charlebm at gmail.com>
Acked-by: Steven Rostedt <rostedt at goodmis.org>
 arch/arm/include/asm/ftrace.h    | 2 +-
 arch/arm/kernel/return_address.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index f89515a..2bb8cac 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
-extern inline void *return_address(unsigned int level)
+static inline void *return_address(unsigned int level)
 	return NULL;
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
index fafedd8..f6aa84d 100644
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
 #warning "TODO: return_address should use unwind tables"
-void *return_address(unsigned int level)
-	return NULL;
 #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */

More information about the linux-arm-kernel mailing list