Skip to content

Commit

Permalink
ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
Browse files Browse the repository at this point in the history
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@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
behanw authored and Nicolas Ferre committed Nov 13, 2015
1 parent d928709 commit dd8d270
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/include/asm/ftrace.h
Expand Up @@ -45,7 +45,7 @@ void *return_address(unsigned int);

#else

extern inline void *return_address(unsigned int level)
static inline void *return_address(unsigned int level)
{
return NULL;
}
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/kernel/return_address.c
Expand Up @@ -62,11 +62,6 @@ void *return_address(unsigned int level)
#warning "TODO: return_address should use unwind tables"
#endif

void *return_address(unsigned int level)
{
return NULL;
}

#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */

EXPORT_SYMBOL_GPL(return_address);

0 comments on commit dd8d270

Please sign in to comment.