lkml.org 
[lkml]   [2019]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 28/28] x86/asm: replace WEAK uses by SYM_INNER_LABEL_ALIGN
    Date
    Use the new SYM_INNER_LABEL_ALIGN for WEAK entries in the middle of x86
    assembly functions.

    And make sure WEAK is not defined for x86 anymore as these were the last
    users.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: x86@kernel.org
    ---
    arch/x86/kernel/ftrace_32.S | 2 +-
    arch/x86/kernel/ftrace_64.S | 2 +-
    arch/x86/kernel/head_32.S | 2 +-
    include/linux/linkage.h | 2 +-
    4 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S
    index b4f495bbd5a1..8ed1f5d371f0 100644
    --- a/arch/x86/kernel/ftrace_32.S
    +++ b/arch/x86/kernel/ftrace_32.S
    @@ -85,7 +85,7 @@ ftrace_graph_call:
    #endif

    /* This is weak to keep gas from relaxing the jumps */
    -WEAK(ftrace_stub)
    +SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
    ret
    SYM_CODE_END(ftrace_caller)

    diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
    index 16deae706950..69c8d1b9119e 100644
    --- a/arch/x86/kernel/ftrace_64.S
    +++ b/arch/x86/kernel/ftrace_64.S
    @@ -168,7 +168,7 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)
    * This is weak to keep gas from relaxing the jumps.
    * It is also used to copy the retq for trampolines.
    */
    -WEAK(ftrace_stub)
    +SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
    retq
    SYM_FUNC_END(ftrace_caller)

    diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
    index 0f4961075792..4b2d668afd70 100644
    --- a/arch/x86/kernel/head_32.S
    +++ b/arch/x86/kernel/head_32.S
    @@ -156,7 +156,7 @@ SYM_CODE_START(startup_32)
    jmp *%eax

    .Lbad_subarch:
    -WEAK(xen_entry)
    +SYM_INNER_LABEL_ALIGN(xen_entry, SYM_L_WEAK)
    /* Unknown implementation; there's really
    nothing we can do at this point. */
    ud2a
    diff --git a/include/linux/linkage.h b/include/linux/linkage.h
    index 331a2306312c..9280209d1f62 100644
    --- a/include/linux/linkage.h
    +++ b/include/linux/linkage.h
    @@ -121,13 +121,13 @@
    #endif /* CONFIG_X86 */
    #endif /* LINKER_SCRIPT */

    +#ifndef CONFIG_X86
    #ifndef WEAK
    /* deprecated, use SYM_FUNC_START_WEAK* */
    #define WEAK(name) \
    SYM_FUNC_START_WEAK(name)
    #endif

    -#ifndef CONFIG_X86
    #ifndef END
    /* deprecated, use SYM_FUNC_END, SYM_DATA_END, or SYM_END */
    #define END(name) \
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-08-08 12:40    [W:4.617 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site