lkml.org 
[lkml]   [2012]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/extable] x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S
    Commit-ID:  d7abc0fa997972ddb6d3c403e03a6eefda0c0881
    Gitweb: http://git.kernel.org/tip/d7abc0fa997972ddb6d3c403e03a6eefda0c0881
    Author: H. Peter Anvin <hpa@zytor.com>
    AuthorDate: Fri, 20 Apr 2012 12:19:50 -0700
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Fri, 20 Apr 2012 13:51:38 -0700

    x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S

    Remove open-coded exception table entries in arch/x86/kernel/entry_64.S,
    and replace them with _ASM_EXTABLE() macros; this will allow us to
    change the format and type of the exception table entries.

    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: David Daney <david.daney@cavium.com>
    Link: http://lkml.kernel.org/r/CA%2B55aFyijf43qSu3N9nWHEBwaGbb7T2Oq9A=9EyR=Jtyqfq_cQ@mail.gmail.com
    ---
    arch/x86/kernel/entry_64.S | 16 ++++------------
    1 files changed, 4 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
    index cdc79b5..320852d 100644
    --- a/arch/x86/kernel/entry_64.S
    +++ b/arch/x86/kernel/entry_64.S
    @@ -55,6 +55,7 @@
    #include <asm/paravirt.h>
    #include <asm/ftrace.h>
    #include <asm/percpu.h>
    +#include <asm/asm.h>
    #include <linux/err.h>

    /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
    @@ -900,18 +901,12 @@ restore_args:

    irq_return:
    INTERRUPT_RETURN
    -
    - .section __ex_table, "a"
    - .quad irq_return, bad_iret
    - .previous
    + _ASM_EXTABLE(irq_return, bad_iret)

    #ifdef CONFIG_PARAVIRT
    ENTRY(native_iret)
    iretq
    -
    - .section __ex_table,"a"
    - .quad native_iret, bad_iret
    - .previous
    + _ASM_EXTABLE(native_iret, bad_iret)
    #endif

    .section .fixup,"ax"
    @@ -1181,10 +1176,7 @@ gs_change:
    CFI_ENDPROC
    END(native_load_gs_index)

    - .section __ex_table,"a"
    - .align 8
    - .quad gs_change,bad_gs
    - .previous
    + _ASM_EXTABLE(gs_change,bad_gs)
    .section .fixup,"ax"
    /* running with kernelgs */
    bad_gs:
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2012-04-21 00:03    [W:0.027 / U:30.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site