lkml.org 
[lkml]   [2014]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2] arm: LLVMLinux: use static inline in ARM ftrace.h
    Date
    From: Behan Webster <behanw@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@converseincode.com>
    Reviewed-by: Mark Charlebois <charlebm@gmail.com>
    Acked-by: Steven Rostedt <rostedt@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);

    #else

    -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"
    #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);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-03-24 07:41    [W:3.420 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site